Renames LauncherID, LauncherItem and LauncherItems...

chrome/browser/ui/ash/launcher/browser_status_monitor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
@@ skipping 29 matching lines @@
       ChromeLauncherController::APP_STATE_INACTIVE;
   if (browser->window()->IsActive() &&
       browser->tab_strip_model()->GetActiveWebContents() == web_contents())
     state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
   else if (browser->window()->IsActive())
     state = ChromeLauncherController::APP_STATE_ACTIVE;
 
   monitor_->UpdateAppItemState(web_contents(), state);
   monitor_->UpdateBrowserItemState();
 
-  // Navigating may change the LauncherID associated with the WebContents.
+  // Navigating may change the ShelfID associated with the WebContents.
   if (browser->tab_strip_model()->GetActiveWebContents() == web_contents()) {
-    ash::SetLauncherIDForWindow(
-        monitor_->GetLauncherIDForWebContents(web_contents()),
+    ash::SetShelfIDForWindow(
+        monitor_->GetShelfIDForWebContents(web_contents()),
         browser->window()->GetNativeWindow());
   }
 }
 
 BrowserStatusMonitor::BrowserStatusMonitor(
     ChromeLauncherController* launcher_controller)
     : launcher_controller_(launcher_controller),
       observed_activation_clients_(this),
       observed_root_windows_(this) {
   DCHECK(launcher_controller_);
@@ skipping 164 matching lines @@
       (TabStripModel::kNoTab !=
            browser->tab_strip_model()->GetIndexOfWebContents(old_contents)))
     UpdateAppItemState(old_contents, state);
 
   if (new_contents) {
     state = browser->window()->IsActive() ?
         ChromeLauncherController::APP_STATE_WINDOW_ACTIVE :
         ChromeLauncherController::APP_STATE_ACTIVE;
     UpdateAppItemState(new_contents, state);
     UpdateBrowserItemState();
-    ash::SetLauncherIDForWindow(
-        GetLauncherIDForWebContents(new_contents),
-        browser->window()->GetNativeWindow());
+    ash::SetShelfIDForWindow(GetShelfIDForWebContents(new_contents),
+                             browser->window()->GetNativeWindow());
   }
 }
 
 void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,
                                          content::WebContents* old_contents,
                                          content::WebContents* new_contents,
                                          int index) {
   DCHECK(old_contents && new_contents);
   Browser* browser = chrome::FindBrowserWithWebContents(new_contents);
 
   if (browser && browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
     return;
 
   UpdateAppItemState(old_contents,
                      ChromeLauncherController::APP_STATE_REMOVED);
   RemoveWebContentsObserver(old_contents);
 
   ChromeLauncherController::AppState state =
       ChromeLauncherController::APP_STATE_ACTIVE;
   if (browser->window()->IsActive() &&
       (tab_strip_model->GetActiveWebContents() == new_contents))
     state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
   UpdateAppItemState(new_contents, state);
   UpdateBrowserItemState();
 
   if (tab_strip_model->GetActiveWebContents() == new_contents) {
-    ash::SetLauncherIDForWindow(
-        GetLauncherIDForWebContents(new_contents),
-        browser->window()->GetNativeWindow());
+    ash::SetShelfIDForWindow(GetShelfIDForWebContents(new_contents),
+                             browser->window()->GetNativeWindow());
   }
 
   AddWebContentsObserver(new_contents);
 }
 
 void BrowserStatusMonitor::TabInsertedAt(content::WebContents* contents,
                                          int index,
                                          bool foreground) {
   // An inserted tab is not active - ActiveTabChanged() will be called to
   // activate. We initialize therefore with |APP_STATE_INACTIVE|.
@@ skipping 48 matching lines @@
 }
 
 void BrowserStatusMonitor::RemoveWebContentsObserver(
     content::WebContents* contents) {
   DCHECK(webcontents_to_observer_map_.find(contents) !=
       webcontents_to_observer_map_.end());
   delete webcontents_to_observer_map_[contents];
   webcontents_to_observer_map_.erase(contents);
 }
 
-ash::LauncherID BrowserStatusMonitor::GetLauncherIDForWebContents(
+ash::ShelfID BrowserStatusMonitor::GetShelfIDForWebContents(
     content::WebContents* contents) {
-  return launcher_controller_->GetLauncherIDForWebContents(contents);
+  return launcher_controller_->GetShelfIDForWebContents(contents);
 }