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

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

Issue 2424183002: Remove Chromecast extension support from cast system tray menu. (Closed)
Patch Set: Additional removals Created 4 years, 1 month 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 21 matching lines...) Expand all
32 #include "chromeos/dbus/session_manager_client.h" 32 #include "chromeos/dbus/session_manager_client.h"
33 #include "components/policy/core/common/cloud/cloud_policy_store.h" 33 #include "components/policy/core/common/cloud/cloud_policy_store.h"
34 #include "components/prefs/pref_change_registrar.h" 34 #include "components/prefs/pref_change_registrar.h"
35 #include "components/signin/core/account_id/account_id.h" 35 #include "components/signin/core/account_id/account_id.h"
36 #include "components/user_manager/user_manager.h" 36 #include "components/user_manager/user_manager.h"
37 #include "content/public/browser/notification_observer.h" 37 #include "content/public/browser/notification_observer.h"
38 #include "content/public/browser/notification_registrar.h" 38 #include "content/public/browser/notification_registrar.h"
39 #include "device/bluetooth/bluetooth_adapter.h" 39 #include "device/bluetooth/bluetooth_adapter.h"
40 #include "device/bluetooth/bluetooth_discovery_session.h" 40 #include "device/bluetooth/bluetooth_discovery_session.h"
41 #include "extensions/browser/app_window/app_window_registry.h" 41 #include "extensions/browser/app_window/app_window_registry.h"
42 #include "ui/base/ime/chromeos/ime_keyboard.h"
42 #include "ui/base/ime/chromeos/input_method_manager.h" 43 #include "ui/base/ime/chromeos/input_method_manager.h"
43 #include "ui/chromeos/ime/input_method_menu_manager.h" 44 #include "ui/chromeos/ime/input_method_menu_manager.h"
44 45
45 namespace ash { 46 namespace ash {
46 class SystemTrayNotifier; 47 class SystemTrayNotifier;
47 class VPNDelegate; 48 class VPNDelegate;
48 } 49 }
49 50
50 namespace user_manager { 51 namespace user_manager {
51 class User; 52 class User;
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 const std::vector<input_method::InputMethodManager::MenuItem>& items) 245 const std::vector<input_method::InputMethodManager::MenuItem>& items)
245 override; 246 override;
246 247
247 // helper methods used by GetSupervisedUserMessage. 248 // helper methods used by GetSupervisedUserMessage.
248 const base::string16 GetLegacySupervisedUserMessage() const; 249 const base::string16 GetLegacySupervisedUserMessage() const;
249 const base::string16 GetChildUserMessage() const; 250 const base::string16 GetChildUserMessage() const;
250 251
251 std::unique_ptr<content::NotificationRegistrar> registrar_; 252 std::unique_ptr<content::NotificationRegistrar> registrar_;
252 std::unique_ptr<PrefChangeRegistrar> local_state_registrar_; 253 std::unique_ptr<PrefChangeRegistrar> local_state_registrar_;
253 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_; 254 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
254 Profile* user_profile_; 255 Profile* user_profile_ = nullptr;
255 int search_key_mapped_to_; 256 int search_key_mapped_to_ = input_method::kSearchKey;
256 bool have_session_start_time_; 257 bool have_session_start_time_ = false;
257 base::TimeTicks session_start_time_; 258 base::TimeTicks session_start_time_;
258 bool have_session_length_limit_; 259 bool have_session_length_limit_ = false;
259 base::TimeDelta session_length_limit_; 260 base::TimeDelta session_length_limit_;
260 std::string enterprise_domain_; 261 std::string enterprise_domain_;
261 bool should_run_bluetooth_discovery_; 262 bool should_run_bluetooth_discovery_ = false;
262 bool session_started_; 263 bool session_started_ = false;
263 264
264 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 265 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
265 std::unique_ptr<device::BluetoothDiscoverySession> 266 std::unique_ptr<device::BluetoothDiscoverySession>
266 bluetooth_discovery_session_; 267 bluetooth_discovery_session_;
267 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; 268 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
268 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 269 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
269 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 270 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
270 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 271 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
271 std::unique_ptr<ash::VPNDelegate> vpn_delegate_; 272 std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
272 273
273 base::ObserverList<ash::CustodianInfoTrayObserver> 274 base::ObserverList<ash::CustodianInfoTrayObserver>
274 custodian_info_changed_observers_; 275 custodian_info_changed_observers_;
275 276
276 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; 277 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
277 278
278 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 279 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
279 280
280 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
281 }; 282 };
282 283
283 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 284 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
284 285
285 } // namespace chromeos 286 } // namespace chromeos
286 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698