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

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

Issue 216293007: ash::internal::TrayBluetooth: Hide spinner if discovery session stops. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
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 "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "ash/ime/input_method_menu_manager.h" 9 #include "ash/ime/input_method_menu_manager.h"
10 #include "ash/session_state_observer.h" 10 #include "ash/session_state_observer.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 gfx::NativeWindow parent_window) OVERRIDE; 113 gfx::NativeWindow parent_window) OVERRIDE;
114 virtual bool EnrollNetwork(const std::string& network_id, 114 virtual bool EnrollNetwork(const std::string& network_id,
115 gfx::NativeWindow parent_window) OVERRIDE; 115 gfx::NativeWindow parent_window) OVERRIDE;
116 virtual void ManageBluetoothDevices() OVERRIDE; 116 virtual void ManageBluetoothDevices() OVERRIDE;
117 virtual void ToggleBluetooth() OVERRIDE; 117 virtual void ToggleBluetooth() OVERRIDE;
118 virtual void ShowMobileSimDialog() OVERRIDE; 118 virtual void ShowMobileSimDialog() OVERRIDE;
119 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; 119 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
120 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; 120 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
121 virtual bool GetBluetoothAvailable() OVERRIDE; 121 virtual bool GetBluetoothAvailable() OVERRIDE;
122 virtual bool GetBluetoothEnabled() OVERRIDE; 122 virtual bool GetBluetoothEnabled() OVERRIDE;
123 virtual bool GetBluetoothDiscovering() OVERRIDE;
123 virtual void ChangeProxySettings() OVERRIDE; 124 virtual void ChangeProxySettings() OVERRIDE;
124 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE; 125 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
125 virtual void SetVolumeControlDelegate( 126 virtual void SetVolumeControlDelegate(
126 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE; 127 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE;
127 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time) 128 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time)
128 OVERRIDE; 129 OVERRIDE;
129 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) 130 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit)
130 OVERRIDE; 131 OVERRIDE;
131 virtual int GetSystemTrayMenuWidth() OVERRIDE; 132 virtual int GetSystemTrayMenuWidth() OVERRIDE;
132 virtual void ActiveUserWasChanged() OVERRIDE; 133 virtual void ActiveUserWasChanged() OVERRIDE;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 279 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
279 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 280 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
280 281
281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 282 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
282 }; 283 };
283 284
284 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 285 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
285 286
286 } // namespace chromeos 287 } // namespace chromeos
287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 288 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('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