chrome/browser/ui/webui/chromeos/login/error_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/error_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: 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/chromeos/login/enrollment_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/eula_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/error_screen_handler.cc

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

index b7fc389ca79e232cd6b15988f126276a5d84c80a..3bfb52e6c4e29271358332973f2f8ef9207fd6b6 100644

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

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

@@ -19,6 +19,8 @@

#include "chrome/browser/ui/extensions/application_launch.h"

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

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

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

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

@@ -27,8 +29,6 @@

#include "components/user_manager/user_manager.h"

#include "extensions/browser/extension_system.h"

#include "grit/browser_resources.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "ui/strings/grit/ui_strings.h"

namespace {