trunk/src/chrome/browser/profile_resetter/resettable_settings_snapshot.cc - Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 9 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:

Index: trunk/src/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

===================================================================

--- trunk/src/chrome/browser/profile_resetter/resettable_settings_snapshot.cc (revision 255866)

+++ trunk/src/chrome/browser/profile_resetter/resettable_settings_snapshot.cc (working copy)

@@ -16,7 +16,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

-#include "chrome/common/chrome_content_client.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/pref_names.h"

#include "content/public/browser/browser_thread.h"

@@ -249,7 +248,7 @@

g_browser_process->GetApplicationLocale());

AddPair(list.get(),

l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_USER_AGENT),

- GetUserAgent());

+ content::GetUserAgent(GURL()));

chrome::VersionInfo version_info;

std::string version = version_info.Version();

version += chrome::VersionInfo::GetVersionStringModifier();