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

Side by Side Diff: chrome/browser/chromeos/app_mode/app_session_lifetime.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
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/chromeos/app_mode/app_session_lifetime.h" 5 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 13 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
14 #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h" 14 #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h"
15 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 15 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
16 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 16 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
17 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 17 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
18 #include "chrome/browser/lifetime/application_lifetime.h" 18 #include "chrome/browser/lifetime/application_lifetime.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_list.h" 21 #include "chrome/browser/ui/browser_list.h"
22 #include "chrome/browser/ui/browser_list_observer.h" 22 #include "chrome/browser/ui/browser_list_observer.h"
23 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
24 #include "chrome/browser/ui/tabs/tab_strip_model.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chromeos/network/network_state.h" 26 #include "chromeos/network/network_state.h"
27 #include "chromeos/network/network_state_handler.h" 27 #include "chromeos/network/network_state_handler.h"
28 #include "components/user_manager/user_id.h"
28 #include "components/user_manager/user_manager.h" 29 #include "components/user_manager/user_manager.h"
29 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
30 #include "extensions/browser/app_window/app_window.h" 31 #include "extensions/browser/app_window/app_window.h"
31 #include "extensions/browser/app_window/app_window_registry.h" 32 #include "extensions/browser/app_window/app_window_registry.h"
32 33
33 using extensions::AppWindow; 34 using extensions::AppWindow;
34 using extensions::AppWindowRegistry; 35 using extensions::AppWindowRegistry;
35 36
36 namespace chromeos { 37 namespace chromeos {
37 38
(...skipping 12 matching lines...) Expand all
50 if (window_registry_) 51 if (window_registry_)
51 window_registry_->AddObserver(this); 52 window_registry_->AddObserver(this);
52 app_id_ = app_id; 53 app_id_ = app_id;
53 } 54 }
54 55
55 private: 56 private:
56 // extensions::AppWindowRegistry::Observer overrides: 57 // extensions::AppWindowRegistry::Observer overrides:
57 void OnAppWindowRemoved(AppWindow* app_window) override { 58 void OnAppWindowRemoved(AppWindow* app_window) override {
58 if (window_registry_->GetAppWindowsForApp(app_id_).empty()) { 59 if (window_registry_->GetAppWindowsForApp(app_id_).empty()) {
59 if (DemoAppLauncher::IsDemoAppSession( 60 if (DemoAppLauncher::IsDemoAppSession(
60 user_manager::UserManager::Get()->GetActiveUser()->email())) { 61 user_manager::UserManager::Get()->GetActiveUser()->GetUserID())) {
61 // If we were in demo mode, we disabled all our network technologies, 62 // If we were in demo mode, we disabled all our network technologies,
62 // re-enable them. 63 // re-enable them.
63 NetworkStateHandler* handler = 64 NetworkStateHandler* handler =
64 NetworkHandler::Get()->network_state_handler(); 65 NetworkHandler::Get()->network_state_handler();
65 handler->SetTechnologyEnabled( 66 handler->SetTechnologyEnabled(
66 NetworkTypePattern::NonVirtual(), 67 NetworkTypePattern::NonVirtual(),
67 true, 68 true,
68 chromeos::network_handler::ErrorCallback()); 69 chromeos::network_handler::ErrorCallback());
69 } 70 }
70 chrome::AttemptUserExit(); 71 chrome::AttemptUserExit();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // Binds the session lifetime with app window counts. 125 // Binds the session lifetime with app window counts.
125 CHECK(app_window_handler == NULL); 126 CHECK(app_window_handler == NULL);
126 app_window_handler.Get().Init(profile, app_id); 127 app_window_handler.Get().Init(profile, app_id);
127 128
128 CHECK(browser_window_handler == NULL); 129 CHECK(browser_window_handler == NULL);
129 browser_window_handler.Get(); 130 browser_window_handler.Get();
130 131
131 // For a demo app, we don't need to either setup the update service or 132 // For a demo app, we don't need to either setup the update service or
132 // the idle app name notification. 133 // the idle app name notification.
133 if (DemoAppLauncher::IsDemoAppSession( 134 if (DemoAppLauncher::IsDemoAppSession(
134 user_manager::UserManager::Get()->GetActiveUser()->email())) 135 user_manager::UserManager::Get()->GetActiveUser()->GetUserID()))
135 return; 136 return;
136 137
137 // Set the app_id for the current instance of KioskAppUpdateService. 138 // Set the app_id for the current instance of KioskAppUpdateService.
138 KioskAppUpdateService* update_service = 139 KioskAppUpdateService* update_service =
139 KioskAppUpdateServiceFactory::GetForProfile(profile); 140 KioskAppUpdateServiceFactory::GetForProfile(profile);
140 DCHECK(update_service); 141 DCHECK(update_service);
141 if (update_service) 142 if (update_service)
142 update_service->Init(app_id); 143 update_service->Init(app_id);
143 144
144 // Start to monitor external update from usb stick. 145 // Start to monitor external update from usb stick.
145 KioskAppManager::Get()->MonitorKioskExternalUpdate(); 146 KioskAppManager::Get()->MonitorKioskExternalUpdate();
146 147
147 // If the device is not enterprise managed, set prefs to reboot after update 148 // If the device is not enterprise managed, set prefs to reboot after update
148 // and create a user security message which shows the user the application 149 // and create a user security message which shows the user the application
149 // name and author after some idle timeout. 150 // name and author after some idle timeout.
150 policy::BrowserPolicyConnectorChromeOS* connector = 151 policy::BrowserPolicyConnectorChromeOS* connector =
151 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 152 g_browser_process->platform_part()->browser_policy_connector_chromeos();
152 if (!connector->IsEnterpriseManaged()) { 153 if (!connector->IsEnterpriseManaged()) {
153 PrefService* local_state = g_browser_process->local_state(); 154 PrefService* local_state = g_browser_process->local_state();
154 local_state->SetBoolean(prefs::kRebootAfterUpdate, true); 155 local_state->SetBoolean(prefs::kRebootAfterUpdate, true);
155 KioskModeIdleAppNameNotification::Initialize(); 156 KioskModeIdleAppNameNotification::Initialize();
156 } 157 }
157 } 158 }
158 159
159 } // namespace chromeos 160 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698