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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

Issue 534013002: 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 unified diff | 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 »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"	5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"

6	6

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

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

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

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

10 #include "chrome/grit/chromium_strings.h"	11 #include "chrome/grit/chromium_strings.h"

11 #include "chrome/grit/generated_resources.h"	12 #include "chrome/grit/generated_resources.h"

12 #include "chromeos/network/network_state.h"	13 #include "chromeos/network/network_state.h"

13 #include "chromeos/network/network_state_handler.h"	14 #include "chromeos/network/network_state_handler.h"

14 #include "grit/chrome_unscaled_resources.h"

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

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

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

18	18

19 namespace {	19 namespace {

20	20

21 const char kJsScreenPath[] = "login.AppLaunchSplashScreen";	21 const char kJsScreenPath[] = "login.AppLaunchSplashScreen";

22	22

23 // Returns network name by service path.	23 // Returns network name by service path.

24 std::string GetNetworkName(const std::string& service_path) {	24 std::string GetNetworkName(const std::string& service_path) {

(...skipping 257 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
282 DCHECK(online_state_);	282 DCHECK(online_state_);

283 if (delegate_ && online_state_) {	283 if (delegate_ && online_state_) {

284 network_config_requested_ = false;	284 network_config_requested_ = false;

285 network_config_done_ = true;	285 network_config_done_ = true;

286 delegate_->OnNetworkConfigRequested(false);	286 delegate_->OnNetworkConfigRequested(false);

287 Show(app_id_);	287 Show(app_id_);

288 }	288 }

289 }	289 }

290	290

291 } // namespace chromeos	291 } // namespace chromeos

OLD	NEW