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

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

Issue 2721553004: Remove auto raw pointer deduction from non-linux specific code. (Closed)
Patch Set: rebase Created 3 years, 9 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/common/system/chromeos/tray_tracing.h" 5 #include "ash/common/system/chromeos/tray_tracing.h"
6 6
7 #include "ash/common/metrics/user_metrics_action.h" 7 #include "ash/common/metrics/user_metrics_action.h"
8 #include "ash/common/strings/grit/ash_strings.h" 8 #include "ash/common/strings/grit/ash_strings.h"
9 #include "ash/common/system/tray/actionable_view.h" 9 #include "ash/common/system/tray/actionable_view.h"
10 #include "ash/common/system/tray/fixed_sized_image_view.h" 10 #include "ash/common/system/tray/fixed_sized_image_view.h"
(...skipping 17 matching lines...) Expand all
28 namespace tray { 28 namespace tray {
29 29
30 class DefaultTracingView : public ActionableView { 30 class DefaultTracingView : public ActionableView {
31 public: 31 public:
32 explicit DefaultTracingView(SystemTrayItem* owner) 32 explicit DefaultTracingView(SystemTrayItem* owner)
33 : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS) { 33 : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS) {
34 SetLayoutManager(new views::FillLayout); 34 SetLayoutManager(new views::FillLayout);
35 TriView* tri_view = TrayPopupUtils::CreateDefaultRowView(); 35 TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
36 AddChildView(tri_view); 36 AddChildView(tri_view);
37 37
38 auto image = TrayPopupUtils::CreateMainImageView(); 38 auto* image = TrayPopupUtils::CreateMainImageView();
39 tri_view->AddView(TriView::Container::START, image); 39 tri_view->AddView(TriView::Container::START, image);
40 40
41 auto label = TrayPopupUtils::CreateDefaultLabel(); 41 auto* label = TrayPopupUtils::CreateDefaultLabel();
42 label->SetMultiLine(true); 42 label->SetMultiLine(true);
43 label->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_TRACING)); 43 label->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_TRACING));
44 tri_view->AddView(TriView::Container::CENTER, label); 44 tri_view->AddView(TriView::Container::CENTER, label);
45 45
46 TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL); 46 TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
47 style.SetupLabel(label); 47 style.SetupLabel(label);
48 image->SetImage( 48 image->SetImage(
49 gfx::CreateVectorIcon(kSystemMenuTracingIcon, style.GetIconColor())); 49 gfx::CreateVectorIcon(kSystemMenuTracingIcon, style.GetIconColor()));
50 50
51 SetInkDropMode(InkDropHostView::InkDropMode::ON); 51 SetInkDropMode(InkDropHostView::InkDropMode::ON);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 default_ = NULL; 105 default_ = NULL;
106 } 106 }
107 107
108 void TrayTracing::DestroyDetailedView() {} 108 void TrayTracing::DestroyDetailedView() {}
109 109
110 void TrayTracing::OnTracingModeChanged(bool value) { 110 void TrayTracing::OnTracingModeChanged(bool value) {
111 SetTrayIconVisible(value); 111 SetTrayIconVisible(value);
112 } 112 }
113 113
114 } // namespace ash 114 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/tray_caps_lock.cc ('k') | ash/common/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698