chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc - Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path.

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/app_launch_splash_screen_handler.cc

Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/views/status_icons/status_tray_win_unittest.cc ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8ceaf234dd86e8150e9dfaa9cba701a50f3b774c..350688b38007cf793184987d5f53bbafe62a4775 100644

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

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

@@ -4,7 +4,6 @@

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

-#include "chrome/app/theme/grit/chrome_unscaled_resources.h"

#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

#include "chrome/browser/chromeos/login/screens/error_screen_actor.h"

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

@@ -12,6 +11,7 @@

#include "chrome/grit/generated_resources.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

+#include "grit/chrome_unscaled_resources.h"

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/webui/web_ui_util.h"

« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »