chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc ('k') | chrome/browser/ui/webui/options/certificate_manager_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 65e432bd7cbddae728d5d0002289bb5a1b5634d2..50688889b19f9a5b5b620bab7ac8e34346f0a7a3 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -66,6 +66,8 @@

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

+#include "chrome/grit/chromium_strings.h"

+#include "chrome/grit/generated_resources.h"

#include "chromeos/chromeos_switches.h"

#include "components/search_engines/template_url.h"

#include "components/search_engines/template_url_service.h"

@@ -86,8 +88,6 @@

#include "extensions/browser/extension_registry.h"

#include "google_apis/gaia/gaia_auth_util.h"

#include "google_apis/gaia/google_service_auth_error.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "grit/theme_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -527,7 +527,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {

chromeos::ProfileHelper::Get()->GetUserByProfile(profile);

if (user && (user->GetType() != user_manager::USER_TYPE_GUEST))

username = user->email();

}

if (!username.empty())

username = gaia::SanitizeEmail(gaia::CanonicalizeEmail(username));