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

Side by Side Diff: ash/system/drive/tray_drive.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/date/tray_date.cc ('k') | ash/system/network/tray_network.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/drive/tray_drive.h" 5 #include "ash/system/drive/tray_drive.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 gfx::Point(pos_x, 237 gfx::Point(pos_x,
238 pos_y + (child_area.height() - kTopPadding - 238 pos_y + (child_area.height() - kTopPadding -
239 kBottomPadding - 239 kBottomPadding -
240 cancel_button_->GetPreferredSize().height())/2), 240 cancel_button_->GetPreferredSize().height())/2),
241 cancel_button_->GetPreferredSize()); 241 cancel_button_->GetPreferredSize());
242 cancel_button_->SetBoundsRect(bounds_button.Intersect(child_area)); 242 cancel_button_->SetBoundsRect(bounds_button.Intersect(child_area));
243 } 243 }
244 244
245 // views::ButtonListener overrides. 245 // views::ButtonListener overrides.
246 virtual void ButtonPressed(views::Button* sender, 246 virtual void ButtonPressed(views::Button* sender,
247 const views::Event& event) OVERRIDE { 247 const ui::Event& event) OVERRIDE {
248 DCHECK(sender == cancel_button_); 248 DCHECK(sender == cancel_button_);
249 container_->OnCancelOperation(file_path_); 249 container_->OnCancelOperation(file_path_);
250 } 250 }
251 251
252 DriveDetailedView* container_; 252 DriveDetailedView* container_;
253 views::ImageView* status_img_; 253 views::ImageView* status_img_;
254 views::View* label_container_; 254 views::View* label_container_;
255 views::ProgressBar* progress_bar_; 255 views::ProgressBar* progress_bar_;
256 views::ImageButton* cancel_button_; 256 views::ImageButton* cancel_button_;
257 FilePath file_path_; 257 FilePath file_path_;
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 436
437 if (default_) 437 if (default_)
438 default_->Update(&list); 438 default_->Update(&list);
439 439
440 if (detailed_) 440 if (detailed_)
441 detailed_->Update(&list); 441 detailed_->Update(&list);
442 } 442 }
443 443
444 } // namespace internal 444 } // namespace internal
445 } // namespace ash 445 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/tray_date.cc ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698