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

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

Issue 141123003: Revert of Changes look for scrollbars on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | ui/base/nine_image_painter_factory.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } 227 }
228 228
229 // Returns true if this subprocess type needs the ResourceBundle initialized 229 // Returns true if this subprocess type needs the ResourceBundle initialized
230 // and resources loaded. 230 // and resources loaded.
231 bool SubprocessNeedsResourceBundle(const std::string& process_type) { 231 bool SubprocessNeedsResourceBundle(const std::string& process_type) {
232 return 232 return
233 #if defined(OS_WIN) || defined(OS_MACOSX) 233 #if defined(OS_WIN) || defined(OS_MACOSX)
234 // Windows needs resources for the default/null plugin. 234 // Windows needs resources for the default/null plugin.
235 // Mac needs them for the plugin process name. 235 // Mac needs them for the plugin process name.
236 process_type == switches::kPluginProcess || 236 process_type == switches::kPluginProcess ||
237 // Needed for scrollbar related images.
238 process_type == switches::kWorkerProcess ||
239 #endif 237 #endif
240 #if defined(OS_POSIX) && !defined(OS_MACOSX) 238 #if defined(OS_POSIX) && !defined(OS_MACOSX)
241 // The zygote process opens the resources for the renderers. 239 // The zygote process opens the resources for the renderers.
242 process_type == switches::kZygoteProcess || 240 process_type == switches::kZygoteProcess ||
243 #endif 241 #endif
244 #if defined(OS_MACOSX) 242 #if defined(OS_MACOSX)
245 // Mac needs them too for scrollbar related images and for sandbox 243 // Mac needs them too for scrollbar related images and for sandbox
246 // profiles. 244 // profiles.
245 process_type == switches::kWorkerProcess ||
247 process_type == switches::kNaClLoaderProcess || 246 process_type == switches::kNaClLoaderProcess ||
248 process_type == switches::kPpapiPluginProcess || 247 process_type == switches::kPpapiPluginProcess ||
249 process_type == switches::kPpapiBrokerProcess || 248 process_type == switches::kPpapiBrokerProcess ||
250 process_type == switches::kGpuProcess || 249 process_type == switches::kGpuProcess ||
251 #endif 250 #endif
252 process_type == switches::kRendererProcess || 251 process_type == switches::kRendererProcess ||
253 process_type == switches::kUtilityProcess; 252 process_type == switches::kUtilityProcess;
254 } 253 }
255 254
256 #if defined(OS_POSIX) 255 #if defined(OS_POSIX)
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 } 857 }
859 858
860 content::ContentUtilityClient* 859 content::ContentUtilityClient*
861 ChromeMainDelegate::CreateContentUtilityClient() { 860 ChromeMainDelegate::CreateContentUtilityClient() {
862 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 861 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
863 return NULL; 862 return NULL;
864 #else 863 #else
865 return &g_chrome_content_utility_client.Get(); 864 return &g_chrome_content_utility_client.Get();
866 #endif 865 #endif
867 } 866 }
OLDNEW
« no previous file with comments | « no previous file | ui/base/nine_image_painter_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698