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

Side by Side Diff: ash/system/tray_update.cc

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/system/user/tray_user.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tray_update.h" 5 #include "ash/system/tray_update.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 AddChildView(image); 50 AddChildView(image);
51 AddChildView(new views::Label( 51 AddChildView(new views::Label(
52 bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE))); 52 bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE)));
53 SetAccessibleName(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE)); 53 SetAccessibleName(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE));
54 } 54 }
55 55
56 virtual ~UpdateView() {} 56 virtual ~UpdateView() {}
57 57
58 private: 58 private:
59 // Overridden from ActionableView. 59 // Overridden from ActionableView.
60 virtual bool PerformAction(const views::Event& event) OVERRIDE { 60 virtual bool PerformAction(const ui::Event& event) OVERRIDE {
61 ash::Shell::GetInstance()->tray_delegate()->RequestRestart(); 61 ash::Shell::GetInstance()->tray_delegate()->RequestRestart();
62 return true; 62 return true;
63 } 63 }
64 64
65 DISALLOW_COPY_AND_ASSIGN(UpdateView); 65 DISALLOW_COPY_AND_ASSIGN(UpdateView);
66 }; 66 };
67 67
68 } 68 }
69 69
70 namespace ash { 70 namespace ash {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 void TrayUpdate::OnUpdateRecommended() { 155 void TrayUpdate::OnUpdateRecommended() {
156 tray_view()->SetVisible(true); 156 tray_view()->SetVisible(true);
157 if (!Shell::GetInstance()->shelf()->IsVisible() && !nagger_.get()) { 157 if (!Shell::GetInstance()->shelf()->IsVisible() && !nagger_.get()) {
158 // The shelf is not visible, and there is no nagger scheduled. 158 // The shelf is not visible, and there is no nagger scheduled.
159 nagger_.reset(new tray::UpdateNagger(this)); 159 nagger_.reset(new tray::UpdateNagger(this));
160 } 160 }
161 } 161 }
162 162
163 } // namespace internal 163 } // namespace internal
164 } // namespace ash 164 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698