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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 53513003: ash: Rename GetLauncherItemIndexForType to GetShelfItemIndexForType(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 52b9114ab84b340c1bdfa02e4b75364b0a12f70b..166a38ff6ebd7fb9b645ace127aacd0eecf83805 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -11,9 +11,9 @@
#include "ash/launcher/launcher.h"
#include "ash/launcher/launcher_item_delegate_manager.h"
#include "ash/launcher/launcher_model.h"
-#include "ash/launcher/launcher_model_util.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model_util.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/wm/window_util.h"
@@ -1063,7 +1063,7 @@ void ChromeLauncherController::ActivateWindowOrMinimizeIfActive(
ash::LauncherID ChromeLauncherController::GetIDByWindow(aura::Window* window) {
int browser_index =
- ash::GetLauncherItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);
+ ash::GetShelfItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);
DCHECK_GE(browser_index, 0);
ash::LauncherID browser_id = model_->items()[browser_index].id;
« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698