diff options
| author | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 01:47:53 +0000 |
|---|---|---|
| committer | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 01:47:53 +0000 |
| commit | 8d0f331b0a7b37e22b4d0233b799f06f86086625 (patch) | |
| tree | dd65306941f23446449823c22201ffa607956704 /content | |
| parent | 44ce9951d38958c31a5cf42f233d28444df4eb4e (diff) | |
| download | chromium_src-8d0f331b0a7b37e22b4d0233b799f06f86086625.zip chromium_src-8d0f331b0a7b37e22b4d0233b799f06f86086625.tar.gz chromium_src-8d0f331b0a7b37e22b4d0233b799f06f86086625.tar.bz2 | |
Fix user agent override restoration pipeline
There were some disconnects in the pipeline that prevented the user agent override
string from being saved and restored from the temporary tab structions in sessions/,
but couldn't be tested on Android because the pathways weren't being exercised in
the same way. This CL finishes hooking it up for ChromeOS (and presumably the other
platforms).
BUG=140600
Review URL: https://chromiumcodereview.appspot.com/10827168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.cc | 3 | ||||
| -rw-r--r-- | content/public/browser/web_contents_observer.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index cee3043..d4c3dafb 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -808,6 +808,9 @@ void WebContentsImpl::SetUserAgentOverride(const std::string& override) { NavigationEntry* entry = controller_.GetActiveEntry(); if (is_loading_ && entry != NULL && entry->GetIsOverridingUserAgent()) controller_.ReloadIgnoringCache(true); + + FOR_EACH_OBSERVER(WebContentsObserver, observers_, + UserAgentOverrideSet(override)); } const std::string& WebContentsImpl::GetUserAgentOverride() const { diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index ac7ff6f..99fc805 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -126,6 +126,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, // It is safe to delete 'this' from here. virtual void WebContentsDestroyed(WebContents* web_contents) {} + // Called when the user agent override for a WebContents has been changed. + virtual void UserAgentOverrideSet(const std::string& user_agent) {} + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |