| Index: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
|
| diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
|
| index e983d480c819d6586dba58da0d67f4285631a753..05f29d64d42110b66c679a5d91aa65ae798b038d 100644
|
| --- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
|
| +++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
|
| @@ -5,23 +5,40 @@
|
| #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
|
|
|
| #include "base/command_line.h"
|
| +#include "base/files/file_path.h"
|
| +#include "base/logging.h"
|
| #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
|
| +#include "chrome/browser/chromeos/login/login_display_host.h"
|
| #include "chrome/browser/chromeos/login/login_display_host_impl.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/extensions/component_loader.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/extensions/application_launch.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chrome/common/extensions/extension_constants.h"
|
| #include "extensions/browser/extension_system.h"
|
| +#include "extensions/common/extension.h"
|
| #include "grit/browser_resources.h"
|
| +#include "ui/base/window_open_disposition.h"
|
|
|
| namespace chromeos {
|
|
|
| const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local";
|
| +const base::FilePath::CharType kDefaultDemoAppPath[] =
|
| + FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");
|
|
|
| -DemoAppLauncher::DemoAppLauncher() : profile_(NULL) {}
|
| +// static
|
| +base::FilePath* DemoAppLauncher::demo_app_path_ = NULL;
|
| +
|
| +DemoAppLauncher::DemoAppLauncher() {
|
| + if (!demo_app_path_)
|
| + demo_app_path_ = new base::FilePath(kDefaultDemoAppPath);
|
| +}
|
|
|
| -DemoAppLauncher::~DemoAppLauncher() {}
|
| +DemoAppLauncher::~DemoAppLauncher() {
|
| + delete demo_app_path_;
|
| +}
|
|
|
| void DemoAppLauncher::StartDemoAppLaunch() {
|
| DVLOG(1) << "Launching demo app...";
|
| @@ -33,21 +50,27 @@ void DemoAppLauncher::StartDemoAppLaunch() {
|
|
|
| // static
|
| bool DemoAppLauncher::IsDemoAppSession(const std::string& user_id) {
|
| - return user_id == kDemoUserName ? true : false;
|
| + return user_id == kDemoUserName;
|
| +}
|
| +
|
| +// static
|
| +void DemoAppLauncher::SetDemoAppPathForTesting(const base::FilePath& path) {
|
| + delete demo_app_path_;
|
| + demo_app_path_ = new base::FilePath(path);
|
| }
|
|
|
| void DemoAppLauncher::OnProfileLoaded(Profile* profile) {
|
| DVLOG(1) << "Profile loaded... Starting demo app launch.";
|
| - profile_ = profile;
|
|
|
| kiosk_profile_loader_.reset();
|
|
|
| // Load our demo app, then launch it.
|
| ExtensionService* extension_service =
|
| - extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| - std::string extension_id = extension_service->component_loader()->Add(
|
| + extensions::ExtensionSystem::Get(profile)->extension_service();
|
| + CHECK(demo_app_path_);
|
| + const std::string extension_id = extension_service->component_loader()->Add(
|
| IDR_DEMO_APP_MANIFEST,
|
| - base::FilePath("/usr/share/chromeos-assets/demo_app"));
|
| + *demo_app_path_);
|
|
|
| const extensions::Extension* extension =
|
| extension_service->GetExtensionById(extension_id, true);
|
| @@ -57,8 +80,8 @@ void DemoAppLauncher::OnProfileLoaded(Profile* profile) {
|
| command_line->AppendSwitchASCII(switches::kAppId, extension_id);
|
|
|
| OpenApplication(AppLaunchParams(
|
| - profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
|
| - InitAppSession(profile_, extension_id);
|
| + profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
|
| + InitAppSession(profile, extension_id);
|
|
|
| UserManager::Get()->SessionStarted();
|
|
|
|
|