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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

Issue 22007003: ash: Rename "Autohide launcher" item. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: just shelf Created 7 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
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
index 1bdacb419117f10604196a5aaa6641a514c80ec7..71b0881c91087e7c0ee328d0a958dbca58858a4e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
@@ -1396,7 +1396,7 @@ void ChromeLauncherControllerPerApp::UpdateAppLaunchersFromPref() {
int max_index = model_->item_count();
// Using the alternate shelf layout the App Icon should be the first item in
// the list thus start adding items at slot 1 (instead of slot 0).
- if(ash::switches::UseAlternateShelfLayout()) {
+ if (ash::switches::UseAlternateShelfLayout()) {
++index;
++max_index;
}
@@ -1501,7 +1501,7 @@ void ChromeLauncherControllerPerApp::SetShelfAutoHideBehaviorFromPrefs() {
void ChromeLauncherControllerPerApp::SetShelfAlignmentFromPrefs() {
if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kShowLauncherAlignmentMenu))
+ switches::kShowShelfAlignmentMenu))
return;
ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698