summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 14:18:53 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 14:18:53 +0000
commit45aafc9f5a70d0b037bb4a9e8081036d355f9374 (patch)
tree0bc5b37adaf4965305f7ca6a03901a69c90b83bd /chrome/browser/tab_contents
parent36c8e5f7523eb31c11fce92246cdaca4e7af4f36 (diff)
downloadchromium_src-45aafc9f5a70d0b037bb4a9e8081036d355f9374.zip
chromium_src-45aafc9f5a70d0b037bb4a9e8081036d355f9374.tar.gz
chromium_src-45aafc9f5a70d0b037bb4a9e8081036d355f9374.tar.bz2
Inspector settings are now cleared before testScriptsTabIsPopulatedOnInspectedPageRefresh.
Review URL: http://codereview.chromium.org/2420003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc7
-rw-r--r--chrome/browser/tab_contents/tab_contents.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index d3e993d..86181cf 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -2442,6 +2442,13 @@ void TabContents::UpdateInspectorSetting(const std::string& key,
inspector_settings->SetString(UTF8ToWide(key), value);
}
+void TabContents::ClearInspectorSettings() {
+ DictionaryValue* inspector_settings =
+ profile()->GetPrefs()->GetMutableDictionary(
+ prefs::kWebKitInspectorSettings);
+ inspector_settings->Clear();
+}
+
void TabContents::Close(RenderViewHost* rvh) {
// The UI may be in an event-tracking loop, such as between the
// mouse-down and mouse-up in text selection or a button click.
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index aa87d38..5d49107 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -922,6 +922,7 @@ class TabContents : public PageNavigator,
const ThumbnailScore& score);
virtual void UpdateInspectorSetting(const std::string& key,
const std::string& value);
+ virtual void ClearInspectorSettings();
virtual void Close(RenderViewHost* render_view_host);
virtual void RequestMove(const gfx::Rect& new_bounds);
virtual void DidStartLoading();