diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 09:44:36 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 09:44:36 +0000 |
| commit | ff7a8f6f83c9569dae22cbab612c7201b2990731 (patch) | |
| tree | 077be1de69146ad797caa7ba6f5f9bcd501b2437 /chrome/browser/tab_contents | |
| parent | 1c67ccc3ab473fd54db8aa1d93b5e216edbe1d01 (diff) | |
| download | chromium_src-ff7a8f6f83c9569dae22cbab612c7201b2990731.zip chromium_src-ff7a8f6f83c9569dae22cbab612c7201b2990731.tar.gz chromium_src-ff7a8f6f83c9569dae22cbab612c7201b2990731.tar.bz2 | |
DevTools: migrate sanity tests to javascript.
Review URL: http://codereview.chromium.org/119368
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 3 |
2 files changed, 1 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 f0608bc..f8d20a3 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -148,8 +148,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( { // Command line switches are used for preferences with no user interface. const CommandLine& command_line = *CommandLine::ForCurrentProcess(); web_prefs.developer_extras_enabled = - !command_line.HasSwitch(switches::kDisableDevTools) && - prefs->GetBoolean(prefs::kWebKitDeveloperExtrasEnabled); + !command_line.HasSwitch(switches::kDisableDevTools); web_prefs.javascript_enabled = !command_line.HasSwitch(switches::kDisableJavaScript) && prefs->GetBoolean(prefs::kWebKitJavascriptEnabled); diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 47b3eb2..4d200c2 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -132,7 +132,6 @@ const wchar_t* kPrefsToObserve[] = { prefs::kWebKitLoadsImagesAutomatically, prefs::kWebKitPluginsEnabled, prefs::kWebKitUsesUniversalDetector, - prefs::kWebKitDeveloperExtrasEnabled, prefs::kWebKitSerifFontFamily, prefs::kWebKitSansSerifFontFamily, prefs::kWebKitFixedFontFamily, @@ -363,8 +362,6 @@ void TabContents::RegisterUserPrefs(PrefService* prefs) { pref_defaults.dom_paste_enabled); prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit, pref_defaults.shrinks_standalone_images_to_fit); - prefs->RegisterBooleanPref(prefs::kWebKitDeveloperExtrasEnabled, - pref_defaults.developer_extras_enabled); prefs->RegisterStringPref(prefs::kWebKitInspectorSettings, pref_defaults.inspector_settings); prefs->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable, |