Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: chrome/app/chrome_main.cc

Issue 7777004: Initialize the resource bundle now that it is used due to http://trac.webkit.org/changeset/93879. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: v3 Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/app/chrome_main.h" 5 #include "chrome/app/chrome_main.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 return 316 return
317 #if defined(OS_WIN) || defined(OS_MACOSX) 317 #if defined(OS_WIN) || defined(OS_MACOSX)
318 // Windows needs resources for the default/null plugin. 318 // Windows needs resources for the default/null plugin.
319 // Mac needs them for the plugin process name. 319 // Mac needs them for the plugin process name.
320 process_type == switches::kPluginProcess || 320 process_type == switches::kPluginProcess ||
321 #endif 321 #endif
322 #if defined(OS_POSIX) && !defined(OS_MACOSX) 322 #if defined(OS_POSIX) && !defined(OS_MACOSX)
323 // The zygote process opens the resources for the renderers. 323 // The zygote process opens the resources for the renderers.
324 process_type == switches::kZygoteProcess || 324 process_type == switches::kZygoteProcess ||
325 #endif 325 #endif
326 #if defined(OS_MACOSX)
327 // Mac needs them to for scrollbar related images.
328 process_type == switches::kWorkerProcess ||
329 #endif
326 process_type == switches::kRendererProcess || 330 process_type == switches::kRendererProcess ||
327 process_type == switches::kExtensionProcess || 331 process_type == switches::kExtensionProcess ||
328 process_type == switches::kUtilityProcess; 332 process_type == switches::kUtilityProcess;
329 } 333 }
330 334
331 // Returns true if this process is a child of the browser process. 335 // Returns true if this process is a child of the browser process.
332 bool SubprocessIsBrowserChild(const std::string& process_type) { 336 bool SubprocessIsBrowserChild(const std::string& process_type) {
333 if (process_type.empty() || 337 if (process_type.empty() ||
334 #if defined(OS_MACOSX) 338 #if defined(OS_MACOSX)
335 process_type == switches::kRelauncherProcess || 339 process_type == switches::kRelauncherProcess ||
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 939
936 if (SubprocessNeedsResourceBundle(process_type)) 940 if (SubprocessNeedsResourceBundle(process_type))
937 ResourceBundle::CleanupSharedInstance(); 941 ResourceBundle::CleanupSharedInstance();
938 942
939 logging::CleanupChromeLogging(); 943 logging::CleanupChromeLogging();
940 944
941 chrome_main::LowLevelShutdown(); 945 chrome_main::LowLevelShutdown();
942 946
943 return exit_code; 947 return exit_code;
944 } 948 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698