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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 9812043: aura: Uber tray should not show up on start screen in kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed build Created 8 years, 9 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
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" 26 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
27 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 27 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
28 #include "chrome/browser/chromeos/cros/cros_library.h" 28 #include "chrome/browser/chromeos/cros/cros_library.h"
29 #include "chrome/browser/chromeos/cros/network_library.h" 29 #include "chrome/browser/chromeos/cros/network_library.h"
30 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 30 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
31 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 31 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
32 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 32 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
33 #include "chrome/browser/chromeos/input_method/input_method_util.h" 33 #include "chrome/browser/chromeos/input_method/input_method_util.h"
34 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h" 34 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
35 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 35 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
36 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
36 #include "chrome/browser/chromeos/login/base_login_display_host.h" 37 #include "chrome/browser/chromeos/login/base_login_display_host.h"
37 #include "chrome/browser/chromeos/login/login_display_host.h" 38 #include "chrome/browser/chromeos/login/login_display_host.h"
38 #include "chrome/browser/chromeos/login/user.h" 39 #include "chrome/browser/chromeos/login/user.h"
39 #include "chrome/browser/chromeos/login/user_manager.h" 40 #include "chrome/browser/chromeos/login/user_manager.h"
40 #include "chrome/browser/chromeos/status/network_menu.h" 41 #include "chrome/browser/chromeos/status/network_menu.h"
41 #include "chrome/browser/chromeos/status/network_menu_icon.h" 42 #include "chrome/browser/chromeos/status/network_menu_icon.h"
42 #include "chrome/browser/chromeos/system/timezone_settings.h" 43 #include "chrome/browser/chromeos/system/timezone_settings.h"
43 #include "chrome/browser/chromeos/system_key_event_listener.h" 44 #include "chrome/browser/chromeos/system_key_event_listener.h"
44 #include "chrome/browser/prefs/pref_service.h" 45 #include "chrome/browser/prefs/pref_service.h"
45 #include "chrome/browser/profiles/profile_manager.h" 46 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 audiohandler->RemoveVolumeObserver(this); 146 audiohandler->RemoveVolumeObserver(this);
146 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); 147 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
147 input_method::InputMethodManager::GetInstance()->RemoveObserver(this); 148 input_method::InputMethodManager::GetInstance()->RemoveObserver(this);
148 system::TimezoneSettings::GetInstance()->RemoveObserver(this); 149 system::TimezoneSettings::GetInstance()->RemoveObserver(this);
149 if (SystemKeyEventListener::GetInstance()) 150 if (SystemKeyEventListener::GetInstance())
150 SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this); 151 SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
151 bluetooth_adapter_->RemoveObserver(this); 152 bluetooth_adapter_->RemoveObserver(this);
152 } 153 }
153 154
154 // Overridden from ash::SystemTrayDelegate: 155 // Overridden from ash::SystemTrayDelegate:
156 virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
157 return !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled();
158 }
159
155 virtual const std::string GetUserDisplayName() const OVERRIDE { 160 virtual const std::string GetUserDisplayName() const OVERRIDE {
156 return UserManager::Get()->GetLoggedInUser().GetDisplayName(); 161 return UserManager::Get()->GetLoggedInUser().GetDisplayName();
157 } 162 }
158 163
159 virtual const std::string GetUserEmail() const OVERRIDE { 164 virtual const std::string GetUserEmail() const OVERRIDE {
160 return UserManager::Get()->GetLoggedInUser().email(); 165 return UserManager::Get()->GetLoggedInUser().email();
161 } 166 }
162 167
163 virtual const SkBitmap& GetUserImage() const OVERRIDE { 168 virtual const SkBitmap& GetUserImage() const OVERRIDE {
164 return UserManager::Get()->GetLoggedInUser().image(); 169 return UserManager::Get()->GetLoggedInUser().image();
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 719 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
715 }; 720 };
716 721
717 } // namespace 722 } // namespace
718 723
719 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 724 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
720 return new chromeos::SystemTrayDelegate(tray); 725 return new chromeos::SystemTrayDelegate(tray);
721 } 726 }
722 727
723 } // namespace chromeos 728 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698