| Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
|
| index b9b80ef27926cd07b1ce3ea2aa64b03876a54f85..b55da944b2639d27feb98aa7a65c69bbbb8af9d7 100644
|
| --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
|
| @@ -80,7 +80,7 @@ class ShellWindowLauncherItemController : public LauncherItemController,
|
| private:
|
| typedef std::list<ShellWindow*> ShellWindowList;
|
|
|
| - void RestoreOrShow(ShellWindow* shell_window);
|
| + void ShowAndActivate(ShellWindow* shell_window);
|
|
|
| // List of associated shell windows
|
| ShellWindowList shell_windows_;
|
|
|