ShellWindowLauncherItemController::RestoreOrShow -> ShowAndActivate

chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.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_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 62 matching lines @@
 
   // Get the number of running applications/incarnations of this.
   size_t shell_window_count() const { return shell_windows_.size(); }
 
   // Activates the window at position |index|.
   void ActivateIndexedApp(size_t index);
 
  private:
   typedef std::list<ShellWindow*> ShellWindowList;
 
-  void RestoreOrShow(ShellWindow* shell_window);
+  void ShowAndActivate(ShellWindow* shell_window);
 
   // List of associated shell windows
   ShellWindowList shell_windows_;
 
   // Pointer to the most recently active shell window
   ShellWindow* last_active_shell_window_;
 
   // The launcher id associated with this set of windows. There is one
   // AppLauncherItemController for each |app_launcher_id_|.
   const std::string app_launcher_id_;
 
   // Scoped list of observed windows (for removal on destruction)
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_