chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

Side by Side Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/chromeos/accessibility/accessibility_manager.cc ('K') | « chrome/browser/chromeos/login/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/chromeos/login/demo_mode/demo_app_launcher.h"	5 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"	10 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"

11 #include "chrome/browser/chromeos/login/ui/login_display_host.h"	11 #include "chrome/browser/chromeos/login/ui/login_display_host.h"

12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

13 #include "chrome/browser/chromeos/login/users/user_manager.h"	13 #include "chrome/browser/chromeos/login/users/user_manager.h"

14 #include "chrome/browser/extensions/component_loader.h"	14 #include "chrome/browser/extensions/component_loader.h"

15 #include "chrome/browser/extensions/extension_service.h"	15 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/lifetime/application_lifetime.h"	16 #include "chrome/browser/lifetime/application_lifetime.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

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

19 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

20 #include "chrome/common/extensions/extension_constants.h"	20 #include "chrome/common/extensions/extension_constants.h"

	21 #include "chrome/grit/browser_resources.h"

21 #include "chromeos/network/network_handler.h"	22 #include "chromeos/network/network_handler.h"

22 #include "chromeos/network/network_state_handler.h"	23 #include "chromeos/network/network_state_handler.h"

23 #include "extensions/browser/extension_system.h"	24 #include "extensions/browser/extension_system.h"

24 #include "extensions/common/extension.h"	25 #include "extensions/common/extension.h"

25 #include "grit/browser_resources.h"

26 #include "ui/base/window_open_disposition.h"	26 #include "ui/base/window_open_disposition.h"

27	27

28 namespace chromeos {	28 namespace chromeos {

29	29

30 const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local";	30 const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local";

31 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";	31 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";

32 const base::FilePath::CharType kDefaultDemoAppPath[] =	32 const base::FilePath::CharType kDefaultDemoAppPath[] =

33 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");	33 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");

34	34

35 // static	35 // static

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100	100

101 LoginDisplayHostImpl::default_host()->Finalize();	101 LoginDisplayHostImpl::default_host()->Finalize();

102 }	102 }

103	103

104 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) {	104 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) {

105 LOG(ERROR) << "Loading the Kiosk Profile failed: " <<	105 LOG(ERROR) << "Loading the Kiosk Profile failed: " <<

106 KioskAppLaunchError::GetErrorMessage(error);	106 KioskAppLaunchError::GetErrorMessage(error);

107 }	107 }

108	108

109 } // namespace chromeos	109 } // namespace chromeos

OLD	NEW