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

Side by Side Diff: ash/system/chromeos/tray_tracing.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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/chromeos/tray_tracing.h" 5 #include "ash/system/chromeos/tray_tracing.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/actionable_view.h" 8 #include "ash/system/tray/actionable_view.h"
9 #include "ash/system/tray/fixed_sized_image_view.h" 9 #include "ash/system/tray/fixed_sized_image_view.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 29 matching lines...) Expand all
40 label_->SetMultiLine(true); 40 label_->SetMultiLine(true);
41 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 41 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
42 label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING)); 42 label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
43 AddChildView(label_); 43 AddChildView(label_);
44 } 44 }
45 45
46 virtual ~DefaultTracingView() {} 46 virtual ~DefaultTracingView() {}
47 47
48 private: 48 private:
49 // Overridden from ActionableView. 49 // Overridden from ActionableView.
50 virtual bool PerformAction(const ui::Event& event) OVERRIDE { 50 virtual bool PerformAction(const ui::Event& event) override {
51 Shell::GetInstance()->system_tray_delegate()->ShowChromeSlow(); 51 Shell::GetInstance()->system_tray_delegate()->ShowChromeSlow();
52 return true; 52 return true;
53 } 53 }
54 54
55 views::ImageView* image_; 55 views::ImageView* image_;
56 views::Label* label_; 56 views::Label* label_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(DefaultTracingView); 58 DISALLOW_COPY_AND_ASSIGN(DefaultTracingView);
59 }; 59 };
60 60
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 101
102 void TrayTracing::DestroyDetailedView() { 102 void TrayTracing::DestroyDetailedView() {
103 } 103 }
104 104
105 void TrayTracing::OnTracingModeChanged(bool value) { 105 void TrayTracing::OnTracingModeChanged(bool value) {
106 SetTrayIconVisible(value); 106 SetTrayIconVisible(value);
107 } 107 }
108 108
109 } // namespace ash 109 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_tracing.h ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698