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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_win.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 | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/ash/system_tray_delegate_win.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 245
246 virtual bool GetBluetoothAvailable() OVERRIDE { 246 virtual bool GetBluetoothAvailable() OVERRIDE {
247 return false; 247 return false;
248 } 248 }
249 249
250 virtual bool GetBluetoothEnabled() OVERRIDE { 250 virtual bool GetBluetoothEnabled() OVERRIDE {
251 return false; 251 return false;
252 } 252 }
253 253
254 virtual bool GetBluetoothDiscovering() OVERRIDE {
255 return false;
256 }
257
254 virtual void ChangeProxySettings() OVERRIDE { 258 virtual void ChangeProxySettings() OVERRIDE {
255 } 259 }
256 260
257 virtual ash::VolumeControlDelegate* 261 virtual ash::VolumeControlDelegate*
258 GetVolumeControlDelegate() const OVERRIDE { 262 GetVolumeControlDelegate() const OVERRIDE {
259 return NULL; 263 return NULL;
260 } 264 }
261 265
262 virtual void SetVolumeControlDelegate( 266 virtual void SetVolumeControlDelegate(
263 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE { 267 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 339
336 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); 340 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin);
337 }; 341 };
338 342
339 } // namespace 343 } // namespace
340 344
341 345
342 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { 346 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() {
343 return new SystemTrayDelegateWin(); 347 return new SystemTrayDelegateWin();
344 } 348 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698