diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
| commit | a154ba9bc83408f1f27b27c4dce6af71486b9166 (patch) | |
| tree | 8efdb3c6a96e3c55922d6fcba78c2de7900a47da /chrome | |
| parent | 328653c2e32b570d8cdbef3938b8b834f3b5abfb (diff) | |
| download | chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.zip chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.gz chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.bz2 | |
net: Rename ProxyService::CreateNull to ProxyService::CreateDirect.
(Note: This was a TODO for eroman).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3336021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 7a7f2d6..dbc481c 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -286,7 +286,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( web_prefs.accelerated_compositing_enabled = !command_line.HasSwitch(switches::kDisableAcceleratedCompositing); web_prefs.accelerated_2d_canvas_enabled = - command_line.HasSwitch(switches::kEnableAccelerated2dCanvas); + !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); web_prefs.memory_info_enabled = command_line.HasSwitch(switches::kEnableMemoryInfo); // The user stylesheet watcher may not exist in a testing profile. diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index ba036a4..b749b16 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -117,6 +117,9 @@ const char kDebugPrint[] = "debug-print"; // Triggers a pletora of diagnostic modes. const char kDiagnostics[] = "diagnostics"; +// Disable gpu-accelerated 2d canvas. +const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas"; + // Disables accelerated compositing. const char kDisableAcceleratedCompositing[] = "disable-accelerated-compositing"; @@ -352,9 +355,6 @@ const char kDumpHistogramsOnExit[] = "dump-histograms-on-exit"; // Enable displaying net log events on the command line. extern const char kLogNetLog[] = "log-net-log"; -// Enable gpu-accelerated 2d canvas. -const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas"; - // Enables AeroPeek for each tab. (This switch only works on Windows 7). const char kEnableAeroPeekTabs[] = "enable-aero-peek-tabs"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index efc74ec..5aa4e35 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -111,7 +111,7 @@ extern const char kDnsLogDetails[]; extern const char kDnsPrefetchDisable[]; extern const char kDomAutomationController[]; extern const char kDumpHistogramsOnExit[]; -extern const char kEnableAccelerated2dCanvas[]; +extern const char kDisableAccelerated2dCanvas[]; extern const char kEnableAeroPeekTabs[]; extern const char kEnableAuthNegotiatePort[]; extern const char kEnableBackgroundMode[]; |