Revert 126764 - Added notion of currently active app / browser

chrome/browser/ui/views/ash/launcher/launcher_updater.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 17 matching lines @@
 
 namespace aura {
 class Window;
 }
 
 // LauncherUpdater is responsible for keeping the launcher representation of a
 // window up to date as the tab strip changes.
 class LauncherUpdater : public TabStripModelObserver,
                         public LauncherFaviconLoader::Delegate {
  public:
-  // This API is to be used as part of testing only.
-  class TestApi {
-   public:
-    explicit TestApi(LauncherUpdater* launcher_updater)
-        : launcher_updater_(launcher_updater) {}
-    virtual ~TestApi() {}
-
-    // Returns the launcher id for |tab| if it's an app otherwise returns the
-    // id for the browser itself.
-    ash::LauncherID GetLauncherID(TabContentsWrapper* tab) {
-      return launcher_updater_->GetLauncherID(tab);
-    }
-
-    // Returns the launcher id for the browser window.
-    ash::LauncherID item_id() const { return launcher_updater_->item_id_; }
-
-   private:
-    LauncherUpdater* launcher_updater_;
-  };
-
   enum Type {
     TYPE_APP,
     TYPE_PANEL,
     TYPE_TABBED
   };
 
   LauncherUpdater(aura::Window* window,
                   TabStripModel* tab_model,
                   ChromeLauncherDelegate* launcher_delegate,
                   Type type,
@@ skipping 13 matching lines @@
 
   Type type() const { return type_; }
 
   TabContentsWrapper* GetTab(ash::LauncherID id);
 
   LauncherFaviconLoader* favicon_loader() const {
     return favicon_loader_.get();
   }
 
   // TabStripModelObserver overrides:
-  void ActivationChanged(TabContentsWrapper* tab, bool active);
-  // Call to indicate that the window the tabcontents are in has changed its
-  // activation state.
-  void BrowserActivationStateChanged();
-
-  // TabStripModel overrides:
   virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
                                 TabContentsWrapper* new_contents,
                                 int index,
                                 bool user_gesture) OVERRIDE;
   virtual void TabChangedAt(
       TabContentsWrapper* tab,
       int index,
       TabStripModelObserver::TabChangeType change_type) OVERRIDE;
   virtual void TabInsertedAt(TabContentsWrapper* contents,
                              int index,
@@ skipping 42 matching lines @@
   void RegisterAppItem(ash::LauncherID id, TabContentsWrapper* tab);
 
   // Creates a tabbed launcher item.
   void CreateTabbedItem();
 
   // Returns true if this LauncherUpdater created the launcher item with the
   // specified id. Returns true if it did. If the id corresponds to an app tab,
   // |tab| is set to the TabContentsWrapper for the app tab.
   bool ContainsID(ash::LauncherID id, TabContentsWrapper** tab);
 
-  // Returns the launcher id for |tab| if it's an app otherwise returns the
-  // id for the browser itself.
-  ash::LauncherID GetLauncherID(TabContentsWrapper* tab);
-
-  // Retrieves the running status of |tab|.
-  ash::LauncherItemStatus GetStatusForTab(TabContentsWrapper* tab);
-
   ash::LauncherModel* launcher_model();
 
   // Browser window we're in.
   aura::Window* window_;
 
   TabStripModel* tab_model_;
 
   ChromeLauncherDelegate* launcher_delegate_;
 
   // Whether this corresponds to an app or tabbed browser.
@@ skipping 13 matching lines @@
   // Used for any app tabs.
   AppTabMap app_map_;
 
   // Loads launcher sized favicons for panels.
   scoped_ptr<LauncherFaviconLoader> favicon_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherUpdater);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_