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

Unified Diff: chrome/browser/ui/views/tabs/base_tab.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.h ('k') | chrome/browser/ui/views/tabs/tab.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/base_tab.cc
===================================================================
--- chrome/browser/ui/views/tabs/base_tab.cc (revision 151406)
+++ chrome/browser/ui/views/tabs/base_tab.cc (working copy)
@@ -47,7 +47,7 @@
explicit TabCloseButton(BaseTab* tab) : views::ImageButton(tab), tab_(tab) {}
virtual ~TabCloseButton() {}
- virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
+ virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
if (tab_->controller())
tab_->controller()->OnMouseEventInTab(this, event);
@@ -60,24 +60,24 @@
// We need to let the parent know about mouse state so that it
// can highlight itself appropriately. Note that Exit events
// fire before Enter events, so this works.
- virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
+ virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE {
CustomButton::OnMouseEntered(event);
parent()->OnMouseEntered(event);
}
- virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE {
+ virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE {
if (tab_->controller())
tab_->controller()->OnMouseEventInTab(this, event);
CustomButton::OnMouseMoved(event);
}
- virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE {
+ virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE {
if (tab_->controller())
tab_->controller()->OnMouseEventInTab(this, event);
CustomButton::OnMouseReleased(event);
}
- virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
+ virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE {
CustomButton::OnMouseExited(event);
parent()->OnMouseExited(event);
}
@@ -302,7 +302,7 @@
return tp ? tp : theme_provider_;
}
-bool BaseTab::OnMousePressed(const views::MouseEvent& event) {
+bool BaseTab::OnMousePressed(const ui::MouseEvent& event) {
if (!controller())
return false;
@@ -337,13 +337,13 @@
return true;
}
-bool BaseTab::OnMouseDragged(const views::MouseEvent& event) {
+bool BaseTab::OnMouseDragged(const ui::MouseEvent& event) {
if (controller())
controller()->ContinueDrag(this, event.location());
return true;
}
-void BaseTab::OnMouseReleased(const views::MouseEvent& event) {
+void BaseTab::OnMouseReleased(const ui::MouseEvent& event) {
if (!controller())
return;
@@ -386,16 +386,16 @@
controller()->EndDrag(true);
}
-void BaseTab::OnMouseEntered(const views::MouseEvent& event) {
+void BaseTab::OnMouseEntered(const ui::MouseEvent& event) {
hover_controller_.Show();
}
-void BaseTab::OnMouseMoved(const views::MouseEvent& event) {
+void BaseTab::OnMouseMoved(const ui::MouseEvent& event) {
if (controller())
controller()->OnMouseEventInTab(this, event);
}
-void BaseTab::OnMouseExited(const views::MouseEvent& event) {
+void BaseTab::OnMouseExited(const ui::MouseEvent& event) {
hover_controller_.Hide();
}
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.h ('k') | chrome/browser/ui/views/tabs/tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698