diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 18:13:53 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 18:13:53 +0000 |
| commit | e5d2f713578962c4a2dc25dffe4002bb4153bfcb (patch) | |
| tree | f8026c823028e7b835259c18ed2685f771cef244 /chrome/test/testing_profile.h | |
| parent | 51b623da27ffd93a28b03377d43a407f7811d292 (diff) | |
| download | chromium_src-e5d2f713578962c4a2dc25dffe4002bb4153bfcb.zip chromium_src-e5d2f713578962c4a2dc25dffe4002bb4153bfcb.tar.gz chromium_src-e5d2f713578962c4a2dc25dffe4002bb4153bfcb.tar.bz2 | |
Do not prepopulate the findbar with incognito search terms.
BUG=32021
TEST=On win/linux, open an incognito window and search for some term. Then open a new normal tab and press Ctrl-F. Findbar should not be prepopoulated with your incognito search term.
Review URL: http://codereview.chromium.org/1561018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 2099948..814d8b9 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -13,6 +13,7 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/favicon_service.h" +#include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/history/history.h" @@ -186,6 +187,11 @@ class TestingProfile : public Profile { virtual net::SSLConfigService* GetSSLConfigService() { return NULL; } virtual Blacklist* GetPrivacyBlacklist() { return NULL; } virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() { return NULL; } + virtual FindBarState* GetFindBarState() { + if (!find_bar_state_.get()) + find_bar_state_.reset(new FindBarState()); + return find_bar_state_.get(); + } virtual HostContentSettingsMap* GetHostContentSettingsMap() { if (!host_content_settings_map_.get()) host_content_settings_map_ = new HostContentSettingsMap(this); @@ -326,6 +332,9 @@ class TestingProfile : public Profile { scoped_refptr<HostContentSettingsMap> host_content_settings_map_; scoped_refptr<GeolocationContentSettingsMap> geolocation_content_settings_map_; + + // Find bar state. Created lazily by GetFindBarState(). + scoped_ptr<FindBarState> find_bar_state_; }; // A profile that derives from another profile. This does not actually |