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

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

Issue 2400553002: ash: Remove broken display notification suppression when settings is open (Closed)
Patch Set: fix comment Created 4 years, 2 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
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/common/system/tray/default_system_tray_delegate.h" 5 #include "ash/common/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/system/networking_config_delegate.h" 10 #include "ash/common/system/networking_config_delegate.h"
(...skipping 26 matching lines...) Expand all
37 DCHECK(info); 37 DCHECK(info);
38 info->severity = UpdateInfo::UPDATE_NONE; 38 info->severity = UpdateInfo::UPDATE_NONE;
39 info->update_required = true; 39 info->update_required = true;
40 info->factory_reset_required = false; 40 info->factory_reset_required = false;
41 } 41 }
42 42
43 bool DefaultSystemTrayDelegate::ShouldShowSettings() { 43 bool DefaultSystemTrayDelegate::ShouldShowSettings() {
44 return true; 44 return true;
45 } 45 }
46 46
47 bool DefaultSystemTrayDelegate::ShouldShowDisplayNotification() {
48 return false;
49 }
50
51 void DefaultSystemTrayDelegate::ToggleBluetooth() { 47 void DefaultSystemTrayDelegate::ToggleBluetooth() {
52 bluetooth_enabled_ = !bluetooth_enabled_; 48 bluetooth_enabled_ = !bluetooth_enabled_;
53 } 49 }
54 50
55 bool DefaultSystemTrayDelegate::IsBluetoothDiscovering() { 51 bool DefaultSystemTrayDelegate::IsBluetoothDiscovering() {
56 return false; 52 return false;
57 } 53 }
58 54
59 bool DefaultSystemTrayDelegate::GetBluetoothAvailable() { 55 bool DefaultSystemTrayDelegate::GetBluetoothAvailable() {
60 return true; 56 return true;
(...skipping 16 matching lines...) Expand all
77 std::unique_ptr<VolumeControlDelegate> delegate) { 73 std::unique_ptr<VolumeControlDelegate> delegate) {
78 volume_control_delegate_ = std::move(delegate); 74 volume_control_delegate_ = std::move(delegate);
79 } 75 }
80 76
81 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { 77 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
82 // This is the default width for English languages. 78 // This is the default width for English languages.
83 return 300; 79 return 300;
84 } 80 }
85 81
86 } // namespace ash 82 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/default_system_tray_delegate.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698