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

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

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

Powered by Google App Engine
This is Rietveld 408576698