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

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

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 13
15 namespace ash { 14 namespace ash {
16 15
17 class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate { 16 class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
18 public: 17 public:
19 DefaultSystemTrayDelegate(); 18 DefaultSystemTrayDelegate();
20 ~DefaultSystemTrayDelegate() override; 19 ~DefaultSystemTrayDelegate() override;
21 20
22 // SystemTrayDelegate 21 // SystemTrayDelegate
(...skipping 16 matching lines...) Expand all
39 38
40 private: 39 private:
41 bool bluetooth_enabled_; 40 bool bluetooth_enabled_;
42 std::unique_ptr<VolumeControlDelegate> volume_control_delegate_; 41 std::unique_ptr<VolumeControlDelegate> volume_control_delegate_;
43 42
44 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 43 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
45 }; 44 };
46 45
47 } // namespace ash 46 } // namespace ash
48 47
49 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 48 #endif // ASH_COMMON_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/networking_config_delegate.cc ('k') | ash/common/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698