Index: chrome/browser/sessions/base_session_service.cc |
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc |
index 54ec8ba501498994d9985e1c0d7769891708564e..fc9fe135400041b7f3e2b5411a0b2c550ebc3b56 100644 |
--- a/chrome/browser/sessions/base_session_service.cc |
+++ b/chrome/browser/sessions/base_session_service.cc |
@@ -187,9 +187,11 @@ SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand( |
entry.GetReferrer().url.spec() : std::string()); |
pickle.WriteInt(entry.GetReferrer().policy); |
+ // Save info required to override the user agent. |
WriteStringToPickle(pickle, &bytes_written, max_state_size, |
entry.GetOriginalRequestURL().is_valid() ? |
entry.GetOriginalRequestURL().spec() : std::string()); |
+ pickle.WriteBool(entry.GetOverrideUserAgent()); |
return new SessionCommand(command_id, pickle); |
} |
@@ -213,6 +215,27 @@ SessionCommand* BaseSessionService::CreateSetTabExtensionAppIDCommand( |
return new SessionCommand(command_id, pickle); |
} |
+SessionCommand* BaseSessionService::CreateSetTabUserAgentOverrideCommand( |
+ SessionID::id_type command_id, |
+ SessionID::id_type tab_id, |
+ const std::string& user_agent_override) { |
+ // Use pickle to handle marshalling. |
+ Pickle pickle; |
+ pickle.WriteInt(tab_id); |
+ |
+ // Enforce a max for the user agent length. They should never be anywhere |
+ // near this size. |
+ static const SessionCommand::size_type max_user_agent_size = |
+ std::numeric_limits<SessionCommand::size_type>::max() - 1024; |
+ |
+ int bytes_written = 0; |
+ |
+ WriteStringToPickle(pickle, &bytes_written, max_user_agent_size, |
+ user_agent_override); |
+ |
+ return new SessionCommand(command_id, pickle); |
+} |
+ |
SessionCommand* BaseSessionService::CreateSetWindowAppNameCommand( |
SessionID::id_type command_id, |
SessionID::id_type window_id, |
@@ -270,11 +293,16 @@ bool BaseSessionService::RestoreUpdateTabNavigationCommand( |
referrer_spec.empty() ? GURL() : GURL(referrer_spec), |
policy); |
- // If the original URL can't be found, leave it empty. |
+ // Default to not overriding the user agent if we don't have enough info. |
std::string url_spec; |
- if (!pickle->ReadString(&iterator, &url_spec)) |
+ bool override_user_agent; |
+ if (!pickle->ReadString(&iterator, &url_spec) || |
+ !pickle->ReadBool(&iterator, &override_user_agent)) { |
url_spec = std::string(); |
sky
2012/04/23 23:30:15
I think you want the override_user_agent in an els
gone
2012/04/24 09:30:37
Current version splits it off.
|
+ override_user_agent = false; |
+ } |
navigation->set_original_request_url(GURL(url_spec)); |
+ navigation->set_override_user_agent(override_user_agent); |
} |
navigation->virtual_url_ = GURL(url_spec); |
@@ -294,6 +322,19 @@ bool BaseSessionService::RestoreSetTabExtensionAppIDCommand( |
pickle->ReadString(&iterator, extension_app_id); |
} |
+bool BaseSessionService::RestoreSetTabUserAgentOverrideCommand( |
+ const SessionCommand& command, |
+ SessionID::id_type* tab_id, |
+ std::string* user_agent_override) { |
+ scoped_ptr<Pickle> pickle(command.PayloadAsPickle()); |
+ if (!pickle.get()) |
+ return false; |
+ |
+ PickleIterator iterator(*pickle); |
+ return pickle->ReadInt(&iterator, tab_id) && |
+ pickle->ReadString(&iterator, user_agent_override); |
+} |
+ |
bool BaseSessionService::RestoreSetWindowAppNameCommand( |
const SessionCommand& command, |
SessionID::id_type* window_id, |