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

Side by Side Diff: ash/system/tray/default_system_tray_delegate.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
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 virtual bool EnrollNetwork(const std::string& network_id, 73 virtual bool EnrollNetwork(const std::string& network_id,
74 gfx::NativeWindow parent_window) OVERRIDE; 74 gfx::NativeWindow parent_window) OVERRIDE;
75 virtual void ManageBluetoothDevices() OVERRIDE; 75 virtual void ManageBluetoothDevices() OVERRIDE;
76 virtual void ToggleBluetooth() OVERRIDE; 76 virtual void ToggleBluetooth() OVERRIDE;
77 virtual bool IsBluetoothDiscovering() OVERRIDE; 77 virtual bool IsBluetoothDiscovering() OVERRIDE;
78 virtual void ShowMobileSimDialog() OVERRIDE; 78 virtual void ShowMobileSimDialog() OVERRIDE;
79 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; 79 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
80 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; 80 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
81 virtual bool GetBluetoothAvailable() OVERRIDE; 81 virtual bool GetBluetoothAvailable() OVERRIDE;
82 virtual bool GetBluetoothEnabled() OVERRIDE; 82 virtual bool GetBluetoothEnabled() OVERRIDE;
83 virtual bool GetBluetoothDiscovering() OVERRIDE;
83 virtual void ChangeProxySettings() OVERRIDE; 84 virtual void ChangeProxySettings() OVERRIDE;
84 virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE; 85 virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
85 virtual void SetVolumeControlDelegate( 86 virtual void SetVolumeControlDelegate(
86 scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE; 87 scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE;
87 virtual bool GetSessionStartTime( 88 virtual bool GetSessionStartTime(
88 base::TimeTicks* session_start_time) OVERRIDE; 89 base::TimeTicks* session_start_time) OVERRIDE;
89 virtual bool GetSessionLengthLimit( 90 virtual bool GetSessionLengthLimit(
90 base::TimeDelta* session_length_limit) OVERRIDE; 91 base::TimeDelta* session_length_limit) OVERRIDE;
91 virtual int GetSystemTrayMenuWidth() OVERRIDE; 92 virtual int GetSystemTrayMenuWidth() OVERRIDE;
92 virtual void ActiveUserWasChanged() OVERRIDE; 93 virtual void ActiveUserWasChanged() OVERRIDE;
93 virtual bool IsNetworkBehindCaptivePortal( 94 virtual bool IsNetworkBehindCaptivePortal(
94 const std::string& service_path) const OVERRIDE; 95 const std::string& service_path) const OVERRIDE;
95 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; 96 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
96 97
97 private: 98 private:
98 bool bluetooth_enabled_; 99 bool bluetooth_enabled_;
99 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 100 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
100 101
101 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 102 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
102 }; 103 };
103 104
104 } // namespace ash 105 } // namespace ash
105 106
106 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 107 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698