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

Unified Diff: ash/shelf/app_list_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/shelf/app_list_button.h ('k') | ash/shelf/shelf_button_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_button.cc
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc
index 80a9b8d19457bb6b6ba1936a75eaeadc0c7a9519..a9612bfe5fc3f5439e0f0a8fc3485a4c1e1ea51b 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -6,8 +6,8 @@
#include <vector>
-#include "ash/launcher/launcher_button_host.h"
#include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_button_host.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/accessibility/accessible_view_state.h"
@@ -25,7 +25,7 @@ const int kAnimationDurationInMs = 600;
const float kAnimationOpacity[] = { 1.0f, 0.4f, 1.0f };
AppListButton::AppListButton(views::ButtonListener* listener,
- LauncherButtonHost* host)
+ ShelfButtonHost* host)
: views::ImageButton(listener),
host_(host) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -86,23 +86,23 @@ void AppListButton::StopLoadingAnimation() {
bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
ImageButton::OnMousePressed(event);
- host_->PointerPressedOnButton(this, LauncherButtonHost::MOUSE, event);
+ host_->PointerPressedOnButton(this, ShelfButtonHost::MOUSE, event);
return true;
}
void AppListButton::OnMouseReleased(const ui::MouseEvent& event) {
ImageButton::OnMouseReleased(event);
- host_->PointerReleasedOnButton(this, LauncherButtonHost::MOUSE, false);
+ host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, false);
}
void AppListButton::OnMouseCaptureLost() {
- host_->PointerReleasedOnButton(this, LauncherButtonHost::MOUSE, true);
+ host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, true);
ImageButton::OnMouseCaptureLost();
}
bool AppListButton::OnMouseDragged(const ui::MouseEvent& event) {
ImageButton::OnMouseDragged(event);
- host_->PointerDraggedOnButton(this, LauncherButtonHost::MOUSE, event);
+ host_->PointerDraggedOnButton(this, ShelfButtonHost::MOUSE, event);
return true;
}
« no previous file with comments | « ash/shelf/app_list_button.h ('k') | ash/shelf/shelf_button_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698