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

Unified Diff: ash/launcher/launcher_button.cc

Issue 57453002: ash: Rename LauncherButtonHost to ShelfButtonHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_button.h ('k') | ash/launcher/launcher_button_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_button.cc
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index 9f0b32ea3b7b170a6b40fb87ba3096c2f0c20188..469f4fca0996abbee78b86ae2c0c752b0b742b49 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "ash/ash_switches.h"
-#include "ash/launcher/launcher_button_host.h"
+#include "ash/shelf/shelf_button_host.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "grit/ash_resources.h"
#include "skia/ext/image_operations.h"
@@ -221,7 +221,7 @@ bool LauncherButton::IconView::HitTestRect(const gfx::Rect& rect) const {
LauncherButton* LauncherButton::Create(
views::ButtonListener* listener,
- LauncherButtonHost* host,
+ ShelfButtonHost* host,
ShelfLayoutManager* shelf_layout_manager) {
LauncherButton* button =
new LauncherButton(listener, host, shelf_layout_manager);
@@ -230,7 +230,7 @@ LauncherButton* LauncherButton::Create(
}
LauncherButton::LauncherButton(views::ButtonListener* listener,
- LauncherButtonHost* host,
+ ShelfButtonHost* host,
ShelfLayoutManager* shelf_layout_manager)
: CustomButton(listener),
host_(host),
@@ -355,24 +355,24 @@ void LauncherButton::ShowContextMenu(const gfx::Point& p,
bool LauncherButton::OnMousePressed(const ui::MouseEvent& event) {
CustomButton::OnMousePressed(event);
- host_->PointerPressedOnButton(this, LauncherButtonHost::MOUSE, event);
+ host_->PointerPressedOnButton(this, ShelfButtonHost::MOUSE, event);
return true;
}
void LauncherButton::OnMouseReleased(const ui::MouseEvent& event) {
CustomButton::OnMouseReleased(event);
- host_->PointerReleasedOnButton(this, LauncherButtonHost::MOUSE, false);
+ host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, false);
}
void LauncherButton::OnMouseCaptureLost() {
ClearState(STATE_HOVERED);
- host_->PointerReleasedOnButton(this, LauncherButtonHost::MOUSE, true);
+ host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, true);
CustomButton::OnMouseCaptureLost();
}
bool LauncherButton::OnMouseDragged(const ui::MouseEvent& event) {
CustomButton::OnMouseDragged(event);
- host_->PointerDraggedOnButton(this, LauncherButtonHost::MOUSE, event);
+ host_->PointerDraggedOnButton(this, ShelfButtonHost::MOUSE, event);
return true;
}
@@ -481,16 +481,16 @@ void LauncherButton::OnGestureEvent(ui::GestureEvent* event) {
ClearState(STATE_HOVERED);
return CustomButton::OnGestureEvent(event);
case ui::ET_GESTURE_SCROLL_BEGIN:
- host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, *event);
+ host_->PointerPressedOnButton(this, ShelfButtonHost::TOUCH, *event);
event->SetHandled();
return;
case ui::ET_GESTURE_SCROLL_UPDATE:
- host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, *event);
+ host_->PointerDraggedOnButton(this, ShelfButtonHost::TOUCH, *event);
event->SetHandled();
return;
case ui::ET_GESTURE_SCROLL_END:
case ui::ET_SCROLL_FLING_START:
- host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
+ host_->PointerReleasedOnButton(this, ShelfButtonHost::TOUCH, false);
event->SetHandled();
return;
default:
« no previous file with comments | « ash/launcher/launcher_button.h ('k') | ash/launcher/launcher_button_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698