Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8224)

Unified Diff: chrome/browser/sessions/session_service.cc

Issue 10827168: Fix user agent override restore pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebasing Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_service.cc
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index a9c5364613508a435383424b14f29324f40cb849..28e7ce1b9f0d2f5555176c8b05d4c4f9872ccbbc 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -519,6 +519,9 @@ void SessionService::Init() {
content::NotificationService::AllSources());
registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
+ registrar_.Add(
+ this, content::NOTIFICATION_WEB_CONTENTS_USER_AGENT_OVERRIDE_CHANGED,
+ content::NotificationService::AllSources());
// Wait for NOTIFICATION_BROWSER_WINDOW_READY so that is_app() is set.
registrar_.Add(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
content::NotificationService::AllBrowserContextsAndSources());
@@ -700,6 +703,17 @@ void SessionService::Observe(int type,
break;
}
+ case content::NOTIFICATION_WEB_CONTENTS_USER_AGENT_OVERRIDE_CHANGED: {
+ TabContents* tab = TabContents::FromWebContents(
+ content::Source<content::WebContents>(source).ptr());
+ if (!tab || tab->profile() != profile())
+ return;
+ SetTabUserAgentOverride(tab->restore_tab_helper()->window_id(),
+ tab->restore_tab_helper()->session_id(),
+ tab->web_contents()->GetUserAgentOverride());
+ break;
+ }
+
case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
extensions::TabHelper* extension_tab_helper =
content::Source<extensions::TabHelper>(source).ptr();

Powered by Google App Engine
This is Rietveld 408576698