resource pak name should be nw.pak

zcbenz · zcbenz · commit eb4cae0ad6de · 2012-08-17T13:48:46.000+08:00
diff --git a/src/paths_mac.mm b/src/paths_mac.mm
@@ -68,7 +68,7 @@ void OverrideChildProcessPath() {
 
 FilePath GetResourcesPakFilePath() {
   NSString* pak_path =
-      [base::mac::FrameworkBundle() pathForResource:@"content_shell"
+      [base::mac::FrameworkBundle() pathForResource:@"nw"
                                              ofType:@"pak"];
 
   return FilePath([pak_path fileSystemRepresentation]);
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -87,13 +87,13 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
   FilePath pak_file;
   DCHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file));
   pak_file = pak_file.Append(FILE_PATH_LITERAL("paks"));
-  pak_file = pak_file.Append(FILE_PATH_LITERAL("content_shell.pak"));
+  pak_file = pak_file.Append(FILE_PATH_LITERAL("nw.pak"));
 
   base::PlatformFile f =
       base::CreatePlatformFile(pak_file, flags, NULL, NULL);
   if (f == base::kInvalidPlatformFileValue) {
     NOTREACHED() << "Failed to open file when creating renderer process: "
-                 << "content_shell.pak";
+                 << "nw.pak";
   }
   mappings->push_back(std::pair<base::GlobalDescriptors::Key, int>(
       kShellPakDescriptor, f));
diff --git a/src/shell_main_delegate.cc b/src/shell_main_delegate.cc
@@ -167,7 +167,7 @@ void ShellMainDelegate::InitializeResourceBundle() {
   PathService::Get(base::DIR_MODULE, &pak_dir);
 #endif
 
-  pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
+  pak_file = pak_dir.Append(FILE_PATH_LITERAL("nw.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ void ShellMainDelegate::InitializeResourceBundle() {`
`167`	`167`	`PathService::Get(base::DIR_MODULE, &pak_dir);`
`168`	`168`	`#endif`
`169`	`169`
`170`		`- pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));`
	`170`	`+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("nw.pak"));`
`171`	`171`	`#endif`
`172`	`172`	`ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);`
`173`	`173`	`}`