Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

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

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert Created 6 years 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
OLDNEW
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/extensions/component_loader.h" 13 #include "chrome/browser/extensions/component_loader.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/lifetime/application_lifetime.h" 15 #include "chrome/browser/lifetime/application_lifetime.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/extensions/app_launch_params.h"
18 #include "chrome/browser/ui/extensions/application_launch.h" 17 #include "chrome/browser/ui/extensions/application_launch.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
21 #include "chrome/grit/browser_resources.h" 20 #include "chrome/grit/browser_resources.h"
22 #include "chromeos/network/network_handler.h" 21 #include "chromeos/network/network_handler.h"
23 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
24 #include "components/user_manager/user_manager.h" 23 #include "components/user_manager/user_manager.h"
25 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
26 #include "extensions/common/constants.h"
27 #include "extensions/common/extension.h" 25 #include "extensions/common/extension.h"
28 #include "ui/base/window_open_disposition.h" 26 #include "ui/base/window_open_disposition.h"
29 27
30 namespace chromeos { 28 namespace chromeos {
31 29
32 const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local"; 30 const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local";
33 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel"; 31 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";
34 const base::FilePath::CharType kDefaultDemoAppPath[] = 32 const base::FilePath::CharType kDefaultDemoAppPath[] =
35 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app"); 33 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");
36 34
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return; 85 return;
88 } 86 }
89 87
90 // Disable network before launching the app. 88 // Disable network before launching the app.
91 LOG(WARNING) << "Disabling network before launching demo app.."; 89 LOG(WARNING) << "Disabling network before launching demo app..";
92 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); 90 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
93 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(), 91 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(),
94 false, 92 false,
95 chromeos::network_handler::ErrorCallback()); 93 chromeos::network_handler::ErrorCallback());
96 94
97 OpenApplication( 95 OpenApplication(AppLaunchParams(
98 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 96 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
99 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
100 InitAppSession(profile, extension_id); 97 InitAppSession(profile, extension_id);
101 98
102 user_manager::UserManager::Get()->SessionStarted(); 99 user_manager::UserManager::Get()->SessionStarted();
103 100
104 LoginDisplayHostImpl::default_host()->Finalize(); 101 LoginDisplayHostImpl::default_host()->Finalize();
105 } 102 }
106 103
107 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) { 104 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) {
108 LOG(ERROR) << "Loading the Kiosk Profile failed: " << 105 LOG(ERROR) << "Loading the Kiosk Profile failed: " <<
109 KioskAppLaunchError::GetErrorMessage(error); 106 KioskAppLaunchError::GetErrorMessage(error);
110 } 107 }
111 108
112 } // namespace chromeos 109 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/first_run/first_run.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698