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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: Created 4 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 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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 24 matching lines...) Expand all
35 #include "content/public/browser/notification_registrar.h" 35 #include "content/public/browser/notification_registrar.h"
36 #include "device/bluetooth/bluetooth_adapter.h" 36 #include "device/bluetooth/bluetooth_adapter.h"
37 #include "device/bluetooth/bluetooth_discovery_session.h" 37 #include "device/bluetooth/bluetooth_discovery_session.h"
38 #include "extensions/browser/app_window/app_window_registry.h" 38 #include "extensions/browser/app_window/app_window_registry.h"
39 #include "ui/base/ime/chromeos/ime_keyboard.h" 39 #include "ui/base/ime/chromeos/ime_keyboard.h"
40 #include "ui/base/ime/chromeos/input_method_manager.h" 40 #include "ui/base/ime/chromeos/input_method_manager.h"
41 #include "ui/chromeos/ime/input_method_menu_manager.h" 41 #include "ui/chromeos/ime/input_method_menu_manager.h"
42 42
43 namespace ash { 43 namespace ash {
44 class SystemTrayNotifier; 44 class SystemTrayNotifier;
45 class VPNDelegate;
45 } 46 }
46 47
47 namespace user_manager { 48 namespace user_manager {
48 class User; 49 class User;
49 } 50 }
50 51
51 namespace chromeos { 52 namespace chromeos {
52 53
53 class SystemTrayDelegateChromeOS 54 class SystemTrayDelegateChromeOS
54 : public ui::ime::InputMethodMenuManager::Observer, 55 : public ui::ime::InputMethodMenuManager::Observer,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 108 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
108 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 109 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
109 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 110 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
110 int GetSystemTrayMenuWidth() override; 111 int GetSystemTrayMenuWidth() override;
111 void ActiveUserWasChanged() override; 112 void ActiveUserWasChanged() override;
112 bool IsSearchKeyMappedToCapsLock() override; 113 bool IsSearchKeyMappedToCapsLock() override;
113 void AddCustodianInfoTrayObserver( 114 void AddCustodianInfoTrayObserver(
114 ash::CustodianInfoTrayObserver* observer) override; 115 ash::CustodianInfoTrayObserver* observer) override;
115 void RemoveCustodianInfoTrayObserver( 116 void RemoveCustodianInfoTrayObserver(
116 ash::CustodianInfoTrayObserver* observer) override; 117 ash::CustodianInfoTrayObserver* observer) override;
118 ash::VPNDelegate* GetVPNDelegate() const override;
117 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( 119 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
118 ash::SystemTray* tray) override; 120 ash::SystemTray* tray) override;
119 121
120 // Overridden from user_manager::UserManager::UserSessionStateObserver: 122 // Overridden from user_manager::UserManager::UserSessionStateObserver:
121 void UserAddedToSession(const user_manager::User* active_user) override; 123 void UserAddedToSession(const user_manager::User* active_user) override;
122 void ActiveUserChanged(const user_manager::User* active_user) override; 124 void ActiveUserChanged(const user_manager::User* active_user) override;
123 125
124 void UserChangedChildStatus(user_manager::User* user) override; 126 void UserChangedChildStatus(user_manager::User* user) override;
125 127
126 private: 128 private:
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 std::string enterprise_realm_; 237 std::string enterprise_realm_;
236 bool should_run_bluetooth_discovery_ = false; 238 bool should_run_bluetooth_discovery_ = false;
237 bool session_started_ = false; 239 bool session_started_ = false;
238 240
239 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 241 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
240 std::unique_ptr<device::BluetoothDiscoverySession> 242 std::unique_ptr<device::BluetoothDiscoverySession>
241 bluetooth_discovery_session_; 243 bluetooth_discovery_session_;
242 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; 244 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
243 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 245 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
244 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 246 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
247 std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
245 248
246 base::ObserverList<ash::CustodianInfoTrayObserver> 249 base::ObserverList<ash::CustodianInfoTrayObserver>
247 custodian_info_changed_observers_; 250 custodian_info_changed_observers_;
248 251
249 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 252 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
250 253
251 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 254 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
252 }; 255 };
253 256
254 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 257 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
255 258
256 } // namespace chromeos 259 } // namespace chromeos
257 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 260 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698