| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.
h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.
h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/launcher/launcher_model.h" | 10 #include "ash/launcher/launcher_model.h" |
| (...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1328 | 1328 |
| 1329 for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin(); | 1329 for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin(); |
| 1330 iter != root_windows.end(); ++iter) { | 1330 iter != root_windows.end(); ++iter) { |
| 1331 ash::Shell::GetInstance()->SetShelfAutoHideBehavior( | 1331 ash::Shell::GetInstance()->SetShelfAutoHideBehavior( |
| 1332 GetShelfAutoHideBehavior(*iter), *iter); | 1332 GetShelfAutoHideBehavior(*iter), *iter); |
| 1333 } | 1333 } |
| 1334 } | 1334 } |
| 1335 | 1335 |
| 1336 void ChromeLauncherControllerPerBrowser::SetShelfAlignmentFromPrefs() { | 1336 void ChromeLauncherControllerPerBrowser::SetShelfAlignmentFromPrefs() { |
| 1337 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 1337 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 1338 switches::kShowLauncherAlignmentMenu)) | 1338 switches::kShowShelfAlignmentMenu)) |
| 1339 return; | 1339 return; |
| 1340 | 1340 |
| 1341 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows(); | 1341 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows(); |
| 1342 | 1342 |
| 1343 for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin(); | 1343 for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin(); |
| 1344 iter != root_windows.end(); ++iter) { | 1344 iter != root_windows.end(); ++iter) { |
| 1345 // See comment in |kShelfAlignment| as to why we consider two prefs. | 1345 // See comment in |kShelfAlignment| as to why we consider two prefs. |
| 1346 const std::string alignment_value( | 1346 const std::string alignment_value( |
| 1347 GetPrefForRootWindow(profile_->GetPrefs(), | 1347 GetPrefForRootWindow(profile_->GetPrefs(), |
| 1348 *iter, | 1348 *iter, |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1468 ash::LauncherID id) { | 1468 ash::LauncherID id) { |
| 1469 return id_to_item_controller_map_[id]->app_id(); | 1469 return id_to_item_controller_map_[id]->app_id(); |
| 1470 } | 1470 } |
| 1471 | 1471 |
| 1472 void ChromeLauncherControllerPerBrowser:: | 1472 void ChromeLauncherControllerPerBrowser:: |
| 1473 MoveItemWithoutPinnedStateChangeNotification(int source_index, | 1473 MoveItemWithoutPinnedStateChangeNotification(int source_index, |
| 1474 int target_index) { | 1474 int target_index) { |
| 1475 base::AutoReset<bool> auto_reset(&ignore_persist_pinned_state_change_, true); | 1475 base::AutoReset<bool> auto_reset(&ignore_persist_pinned_state_change_, true); |
| 1476 model_->Move(source_index, target_index); | 1476 model_->Move(source_index, target_index); |
| 1477 } | 1477 } |
| OLD | NEW |