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

Side by Side Diff: ash/system/tray/default_system_tray_delegate.cc

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, 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/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('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 #include "ash/system/tray/default_system_tray_delegate.h" 5 #include "ash/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/session_state_delegate.h" 9 #include "ash/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 246 }
247 247
248 bool DefaultSystemTrayDelegate::GetBluetoothAvailable() { 248 bool DefaultSystemTrayDelegate::GetBluetoothAvailable() {
249 return true; 249 return true;
250 } 250 }
251 251
252 bool DefaultSystemTrayDelegate::GetBluetoothEnabled() { 252 bool DefaultSystemTrayDelegate::GetBluetoothEnabled() {
253 return bluetooth_enabled_; 253 return bluetooth_enabled_;
254 } 254 }
255 255
256 bool DefaultSystemTrayDelegate::GetBluetoothDiscovering() {
257 return false;
258 }
259
256 void DefaultSystemTrayDelegate::ChangeProxySettings() { 260 void DefaultSystemTrayDelegate::ChangeProxySettings() {
257 } 261 }
258 262
259 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate() 263 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate()
260 const { 264 const {
261 return volume_control_delegate_.get(); 265 return volume_control_delegate_.get();
262 } 266 }
263 267
264 void DefaultSystemTrayDelegate::SetVolumeControlDelegate( 268 void DefaultSystemTrayDelegate::SetVolumeControlDelegate(
265 scoped_ptr<VolumeControlDelegate> delegate) { 269 scoped_ptr<VolumeControlDelegate> delegate) {
(...skipping 21 matching lines...) Expand all
287 bool DefaultSystemTrayDelegate::IsNetworkBehindCaptivePortal( 291 bool DefaultSystemTrayDelegate::IsNetworkBehindCaptivePortal(
288 const std::string& /* service_path */) const { 292 const std::string& /* service_path */) const {
289 return false; 293 return false;
290 } 294 }
291 295
292 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 296 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
293 return false; 297 return false;
294 } 298 }
295 299
296 } // namespace ash 300 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698