chrome/browser/ui/webui/chromeos/login/app_launch_splash_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/app_launch_splash_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/keyboard_overlay_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_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/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 016c94a8aa36cb77c2d8e1ef05c600314367e5f9..19978d4bbfad40811e64ff0936b3b7d1d727b39d 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

@@ -7,12 +7,12 @@

#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"

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

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

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

#include "grit/browser_resources.h"

#include "grit/chrome_unscaled_resources.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

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

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

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

@@ -182,7 +182,7 @@ void AppLaunchSplashScreenHandler::ShowNetworkConfigureUI() {

ErrorScreen::ERROR_STATE_OFFLINE, network_name);

NOTREACHED();

break;

- };

+ }

OobeUI::Screen screen = OobeUI::SCREEN_UNKNOWN;

OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController());