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

Side by Side Diff: ash/system/chromeos/screen_security/screen_tray_item.cc

Issue 687183004: Remove the OnError method from notification delegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/screen_security/screen_tray_item.h" 5 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
6 6
7 #include "ash/system/tray/fixed_sized_image_view.h" 7 #include "ash/system/tray/fixed_sized_image_view.h"
8 #include "ash/system/tray/tray_constants.h" 8 #include "ash/system/tray/tray_constants.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/message_center/message_center.h" 10 #include "ui/message_center/message_center.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 ScreenTrayItem* screen_tray) 112 ScreenTrayItem* screen_tray)
113 : screen_tray_(screen_tray) { 113 : screen_tray_(screen_tray) {
114 } 114 }
115 115
116 ScreenNotificationDelegate::~ScreenNotificationDelegate() { 116 ScreenNotificationDelegate::~ScreenNotificationDelegate() {
117 } 117 }
118 118
119 void ScreenNotificationDelegate::Display() { 119 void ScreenNotificationDelegate::Display() {
120 } 120 }
121 121
122 void ScreenNotificationDelegate::Error() {
123 }
124
125 void ScreenNotificationDelegate::Close(bool by_user) { 122 void ScreenNotificationDelegate::Close(bool by_user) {
126 } 123 }
127 124
128 void ScreenNotificationDelegate::Click() { 125 void ScreenNotificationDelegate::Click() {
129 } 126 }
130 127
131 void ScreenNotificationDelegate::ButtonClick(int button_index) { 128 void ScreenNotificationDelegate::ButtonClick(int button_index) {
132 DCHECK_EQ(0, button_index); 129 DCHECK_EQ(0, button_index);
133 screen_tray_->Stop(); 130 screen_tray_->Stop();
134 } 131 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 views::BoxLayout::Orientation layout = 199 views::BoxLayout::Orientation layout =
203 (alignment == ash::SHELF_ALIGNMENT_BOTTOM || 200 (alignment == ash::SHELF_ALIGNMENT_BOTTOM ||
204 alignment == ash::SHELF_ALIGNMENT_TOP) 201 alignment == ash::SHELF_ALIGNMENT_TOP)
205 ? views::BoxLayout::kHorizontal 202 ? views::BoxLayout::kHorizontal
206 : views::BoxLayout::kVertical; 203 : views::BoxLayout::kVertical;
207 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); 204 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
208 tray_view_->Layout(); 205 tray_view_->Layout();
209 } 206 }
210 207
211 } // namespace ash 208 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698