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

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

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/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 #include <utility> 8 #include <utility>
9 9
10 #include "ash/networking_config_delegate.h" 10 #include "ash/networking_config_delegate.h"
11 #include "ash/session/session_state_delegate.h"
12 #include "ash/shell.h" 11 #include "ash/shell.h"
13 #include "ash/volume_control_delegate.h" 12 #include "ash/volume_control_delegate.h"
14 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
15 #include "base/time/time.h" 14 #include "base/time/time.h"
16 15
17 namespace ash { 16 namespace ash {
18 17
19 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() 18 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate()
20 : bluetooth_enabled_(true) { 19 : bluetooth_enabled_(true) {
21 } 20 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 std::unique_ptr<VolumeControlDelegate> delegate) { 84 std::unique_ptr<VolumeControlDelegate> delegate) {
86 volume_control_delegate_ = std::move(delegate); 85 volume_control_delegate_ = std::move(delegate);
87 } 86 }
88 87
89 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
90 // This is the default width for English languages. 89 // This is the default width for English languages.
91 return 300; 90 return 300;
92 } 91 }
93 92
94 } // namespace ash 93 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.cc ('k') | ash/system/tray/media_security/multi_profile_media_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698