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

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

Issue 143953007: Changes look for scrollbars on windows (2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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 | content/test/webkit_support.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) 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 ||
237 #endif 239 #endif
238 #if defined(OS_POSIX) && !defined(OS_MACOSX) 240 #if defined(OS_POSIX) && !defined(OS_MACOSX)
239 // The zygote process opens the resources for the renderers. 241 // The zygote process opens the resources for the renderers.
240 process_type == switches::kZygoteProcess || 242 process_type == switches::kZygoteProcess ||
241 #endif 243 #endif
242 #if defined(OS_MACOSX) 244 #if defined(OS_MACOSX)
243 // Mac needs them too for scrollbar related images and for sandbox 245 // Mac needs them too for scrollbar related images and for sandbox
244 // profiles. 246 // profiles.
245 process_type == switches::kWorkerProcess ||
246 process_type == switches::kNaClLoaderProcess || 247 process_type == switches::kNaClLoaderProcess ||
247 process_type == switches::kPpapiPluginProcess || 248 process_type == switches::kPpapiPluginProcess ||
248 process_type == switches::kPpapiBrokerProcess || 249 process_type == switches::kPpapiBrokerProcess ||
249 process_type == switches::kGpuProcess || 250 process_type == switches::kGpuProcess ||
250 #endif 251 #endif
251 process_type == switches::kRendererProcess || 252 process_type == switches::kRendererProcess ||
252 process_type == switches::kUtilityProcess; 253 process_type == switches::kUtilityProcess;
253 } 254 }
254 255
255 #if defined(OS_POSIX) 256 #if defined(OS_POSIX)
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 } 858 }
858 859
859 content::ContentUtilityClient* 860 content::ContentUtilityClient*
860 ChromeMainDelegate::CreateContentUtilityClient() { 861 ChromeMainDelegate::CreateContentUtilityClient() {
861 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 862 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
862 return NULL; 863 return NULL;
863 #else 864 #else
864 return &g_chrome_content_utility_client.Get(); 865 return &g_chrome_content_utility_client.Get();
865 #endif 866 #endif
866 } 867 }
OLDNEW
« no previous file with comments | « no previous file | content/test/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698