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

Unified Diff: ash/launcher/tabbed_launcher_button.cc

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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/tabbed_launcher_button.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/tabbed_launcher_button.cc
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 7bd5682e7254f08dbf3887b851013ac250e3f766..517607c4ace30deb1f5444f5dd60785c063c6e0a 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -115,17 +115,20 @@ const gfx::ImageSkia*
TabbedLauncherButton* TabbedLauncherButton::Create(
views::ButtonListener* listener,
LauncherButtonHost* host,
+ ShelfLayoutManager* shelf_layout_manager,
IncognitoState is_incognito) {
- TabbedLauncherButton* button =
- new TabbedLauncherButton(listener, host, is_incognito);
+ TabbedLauncherButton* button = new TabbedLauncherButton(
+ listener, host, shelf_layout_manager, is_incognito);
button->Init();
return button;
}
-TabbedLauncherButton::TabbedLauncherButton(views::ButtonListener* listener,
- LauncherButtonHost* host,
- IncognitoState is_incognito)
- : LauncherButton(listener, host),
+TabbedLauncherButton::TabbedLauncherButton(
+ views::ButtonListener* listener,
+ LauncherButtonHost* host,
+ ShelfLayoutManager* shelf_layout_manager,
+ IncognitoState is_incognito)
+ : LauncherButton(listener, host, shelf_layout_manager),
is_incognito_(is_incognito) {
set_accessibility_focusable(true);
}
« no previous file with comments | « ash/launcher/tabbed_launcher_button.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698