content/browser/web_contents/web_contents_impl.cc - Issue 11186039: Move CC switches to cc/switches.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11186039: Move CC switches to cc/switches.h. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Switch ui/compositor back to using compositorSupport() Created 8 years, 2 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:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index b13778c493adaa959318bfe5ff6b93a73f167b49..c09ad4df91122d240b7d91f9a9d0893a74823af9 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -15,6 +15,7 @@

#include "base/sys_info.h"

#include "base/time.h"

#include "base/utf_string_conversions.h"

+#include "cc/switches.h"

#include "content/browser/browser_plugin/browser_plugin_embedder.h"

#include "content/browser/browser_plugin/browser_plugin_guest.h"

#include "content/browser/browser_plugin/old/old_browser_plugin_host.h"

@@ -683,7 +684,7 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,

prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors();

prefs.apply_page_scale_factor_in_compositor =

- command_line.HasSwitch(switches::kEnablePinchInCompositor);

+ command_line.HasSwitch(cc::switches::kEnablePinchInCompositor);

content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs);