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

Side by Side Diff: ash/wm/maximize_bubble_controller.cc

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (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/test/capture_tracking_view.cc ('k') | ash/wm/partial_screenshot_view.h » ('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/wm/maximize_bubble_controller.h" 5 #include "ash/wm/maximize_bubble_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "ash/wm/workspace/frame_maximize_button.h" 10 #include "ash/wm/workspace/frame_maximize_button.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 public: 339 public:
340 explicit BubbleDialogButton( 340 explicit BubbleDialogButton(
341 BubbleContentsButtonRow* button_row_listener, 341 BubbleContentsButtonRow* button_row_listener,
342 int normal_image, 342 int normal_image,
343 int hovered_image, 343 int hovered_image,
344 int pressed_image); 344 int pressed_image);
345 virtual ~BubbleDialogButton() {} 345 virtual ~BubbleDialogButton() {}
346 346
347 // CustomButton overrides: 347 // CustomButton overrides:
348 virtual void OnMouseCaptureLost() OVERRIDE; 348 virtual void OnMouseCaptureLost() OVERRIDE;
349 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; 349 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
350 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; 350 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
351 351
352 private: 352 private:
353 // The creating class which needs to get notified in case of a hover event. 353 // The creating class which needs to get notified in case of a hover event.
354 BubbleContentsButtonRow* button_row_; 354 BubbleContentsButtonRow* button_row_;
355 355
356 DISALLOW_COPY_AND_ASSIGN(BubbleDialogButton); 356 DISALLOW_COPY_AND_ASSIGN(BubbleDialogButton);
357 }; 357 };
358 358
359 MaximizeBubbleController::Bubble::Bubble(MaximizeBubbleController* owner) 359 MaximizeBubbleController::Bubble::Bubble(MaximizeBubbleController* owner)
360 : views::BubbleDelegateView(owner->frame_maximize_button(), 360 : views::BubbleDelegateView(owner->frame_maximize_button(),
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 SetImage(views::CustomButton::BS_PUSHED, 723 SetImage(views::CustomButton::BS_PUSHED,
724 rb.GetImageSkiaNamed(pressed_image)); 724 rb.GetImageSkiaNamed(pressed_image));
725 button_row->AddChildView(this); 725 button_row->AddChildView(this);
726 } 726 }
727 727
728 void BubbleDialogButton::OnMouseCaptureLost() { 728 void BubbleDialogButton::OnMouseCaptureLost() {
729 button_row_->ButtonHovered(NULL); 729 button_row_->ButtonHovered(NULL);
730 views::ImageButton::OnMouseCaptureLost(); 730 views::ImageButton::OnMouseCaptureLost();
731 } 731 }
732 732
733 void BubbleDialogButton::OnMouseEntered(const views::MouseEvent& event) { 733 void BubbleDialogButton::OnMouseEntered(const ui::MouseEvent& event) {
734 button_row_->ButtonHovered(this); 734 button_row_->ButtonHovered(this);
735 views::ImageButton::OnMouseEntered(event); 735 views::ImageButton::OnMouseEntered(event);
736 } 736 }
737 737
738 void BubbleDialogButton::OnMouseExited(const views::MouseEvent& event) { 738 void BubbleDialogButton::OnMouseExited(const ui::MouseEvent& event) {
739 button_row_->ButtonHovered(NULL); 739 button_row_->ButtonHovered(NULL);
740 views::ImageButton::OnMouseExited(event); 740 views::ImageButton::OnMouseExited(event);
741 } 741 }
742 742
743 } // namespace ash 743 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/capture_tracking_view.cc ('k') | ash/wm/partial_screenshot_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698