summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 19:34:57 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 19:34:57 +0000
commitf9a4a3ab3a7e9c05c18e49b58e0d5dafffe0052c (patch)
treef69bd3460ef1940ea83e4a470de569f69ab6e947 /chrome/app
parent7f4c6d23f3b1726e5587f4e471561f8c3fc1020a (diff)
downloadchromium_src-f9a4a3ab3a7e9c05c18e49b58e0d5dafffe0052c.zip
chromium_src-f9a4a3ab3a7e9c05c18e49b58e0d5dafffe0052c.tar.gz
chromium_src-f9a4a3ab3a7e9c05c18e49b58e0d5dafffe0052c.tar.bz2
Revert of Changes look for scrollbars on windows (https://codereview.chromium.org/137533012/)
Reason for revert: Broke webkit_unit_tests:ScrollingCoordinatorChromiumTest.rtlIframe Original issue's description: > Changes look for scrollbars on windows > > Additionally respects the size from the OS. > > BUG=333499 332937 > TEST=none > R=sadrul@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245886 TBR=sadrul@chromium.org,jam@chromium.org,cpu@chromium.org,sky@chromium.org NOTREECHECKS=true NOTRY=true BUG=333499 332937 Review URL: https://codereview.chromium.org/141123003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main_delegate.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 2b69548..579874d 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -234,8 +234,6 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
// Windows needs resources for the default/null plugin.
// Mac needs them for the plugin process name.
process_type == switches::kPluginProcess ||
- // Needed for scrollbar related images.
- process_type == switches::kWorkerProcess ||
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
// The zygote process opens the resources for the renderers.
@@ -244,6 +242,7 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
#if defined(OS_MACOSX)
// Mac needs them too for scrollbar related images and for sandbox
// profiles.
+ process_type == switches::kWorkerProcess ||
process_type == switches::kNaClLoaderProcess ||
process_type == switches::kPpapiPluginProcess ||
process_type == switches::kPpapiBrokerProcess ||