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

Unified Diff: ash/shelf/app_list_button.cc

Issue 97983003: Start the move of launcher_types.h to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: the rename Created 7 years 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_types.cc ('k') | ash/shelf/overflow_bubble_view.cc » ('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 697ed772b49da3ee661672a1f9a92bb2b9667b8c..673ed11be9418a0bf1a0d9500338808565896e74 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -7,8 +7,8 @@
#include <vector>
#include "ash/ash_constants.h"
-#include "ash/launcher/launcher_types.h"
#include "ash/shelf/shelf_button_host.h"
+#include "ash/shelf/shelf_constants.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/accessibility/accessible_view_state.h"
@@ -43,7 +43,7 @@ AppListButton::AppListButton(views::ButtonListener* listener,
rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).
ToImageSkia());
SetAccessibleName(l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE));
- SetSize(gfx::Size(kLauncherPreferredSize, kLauncherPreferredSize));
+ SetSize(gfx::Size(kShelfPreferredSize, kShelfPreferredSize));
SetImageAlignment(ImageButton::ALIGN_CENTER, ImageButton::ALIGN_TOP);
SetFocusPainter(views::Painter::CreateSolidFocusPainter(
kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
« no previous file with comments | « ash/launcher/launcher_types.cc ('k') | ash/shelf/overflow_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698