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

Side by Side Diff: athena/system/status_icon_container_view.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 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
« no previous file with comments | « athena/system/shutdown_dialog.cc ('k') | athena/system/status_icon_container_view.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ 5 #ifndef ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_
6 #define ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ 6 #define ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_
7 7
8 #include "athena/system/public/system_ui.h" 8 #include "athena/system/public/system_ui.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 namespace athena { 12 namespace athena {
13 13
14 // View which displays the system tray icons. 14 // View which displays the system tray icons.
15 class StatusIconContainerView : public views::View { 15 class StatusIconContainerView : public views::View {
16 public: 16 public:
17 StatusIconContainerView(SystemUI::ColorScheme color_scheme); 17 StatusIconContainerView(SystemUI::ColorScheme color_scheme);
18 virtual ~StatusIconContainerView(); 18 ~StatusIconContainerView() override;
19 19
20 private: 20 private:
21 // views::View: 21 // views::View:
22 virtual bool OnMousePressed(const ui::MouseEvent& event) override; 22 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
23 virtual void OnGestureEvent(ui::GestureEvent* event) override; 23 virtual void OnGestureEvent(ui::GestureEvent* event) override;
24 virtual void ChildPreferredSizeChanged(views::View* child) override; 24 virtual void ChildPreferredSizeChanged(views::View* child) override;
25 25
26 class PowerStatus; 26 class PowerStatus;
27 scoped_ptr<PowerStatus> power_status_; 27 scoped_ptr<PowerStatus> power_status_;
28 28
29 class NetworkStatus; 29 class NetworkStatus;
30 scoped_ptr<NetworkStatus> network_status_; 30 scoped_ptr<NetworkStatus> network_status_;
31 31
32 class UpdateStatus; 32 class UpdateStatus;
33 scoped_ptr<UpdateStatus> update_status_; 33 scoped_ptr<UpdateStatus> update_status_;
34 34
35 DISALLOW_COPY_AND_ASSIGN(StatusIconContainerView); 35 DISALLOW_COPY_AND_ASSIGN(StatusIconContainerView);
36 }; 36 };
37 37
38 } // namespace athena 38 } // namespace athena
39 39
40 #endif // ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ 40 #endif // ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_
OLDNEW
« no previous file with comments | « athena/system/shutdown_dialog.cc ('k') | athena/system/status_icon_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698