chrome/browser/ui/webui/chromeos/login/network_screen_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/chromeos/login/network_screen_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: nit 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

« chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc ('K') | « chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

index 06724e71ece53e75b0bf5907d08c385902d73111..2724c073b6e95b053ad45abacd5ad7348f1365ea 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

@@ -24,11 +24,11 @@

#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/pref_names.h"

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

#include "chromeos/chromeos_switches.h"

#include "chromeos/ime/extension_ime_util.h"

#include "chromeos/network/network_handler.h"

#include "chromeos/network/network_state_handler.h"

-#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/rect.h"

#include "ui/views/layout/fill_layout.h"

@@ -50,7 +50,6 @@ const char kJsApiNetworkOnTimezoneChanged[] = "networkOnTimezoneChanged";

// "selected" only if loaded_locale is a backup for "requested_locale".

std::string CalculateSelectedLanguage(const std::string& requested_locale,

const std::string& loaded_locale) {

std::string resolved_locale;

if (!l10n_util::CheckAndResolveLocale(requested_locale, &resolved_locale))

return loaded_locale;