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

Side by Side Diff: chrome/browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.h

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix more shell and Shell refs 2 Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTR OLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTR OLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTR OLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTR OLLER_H_
7 7
8 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h" 8 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
9 9
10 // Inherits from ShellWindowLauncherController and overwrites the ShellWindow 10 // Inherits from ShellWindowLauncherController and overwrites the ShellWindow
11 // observing functions to switch between users dynamically. 11 // observing functions to switch between users dynamically.
12 // TODO(jamescook): Rename this to MultiProfileAppWindowLauncherController.
scheib 2014/02/15 00:12:35 issue number?
12 class MultiProfileShellWindowLauncherController 13 class MultiProfileShellWindowLauncherController
13 : public ShellWindowLauncherController { 14 : public ShellWindowLauncherController {
14 public: 15 public:
15 explicit MultiProfileShellWindowLauncherController( 16 explicit MultiProfileShellWindowLauncherController(
16 ChromeLauncherController* owner); 17 ChromeLauncherController* owner);
17 virtual ~MultiProfileShellWindowLauncherController(); 18 virtual ~MultiProfileShellWindowLauncherController();
18 19
19 // Overridden from ShellWindowLauncherController: 20 // Overridden from ShellWindowLauncherController:
20 virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE; 21 virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE;
21 virtual void AdditionalUserAddedToSession(Profile* profile) OVERRIDE; 22 virtual void AdditionalUserAddedToSession(Profile* profile) OVERRIDE;
22 23
23 // Overridden from ShellWindowRegistry::Observer: 24 // Overridden from AppWindowRegistry::Observer:
24 virtual void OnShellWindowAdded(apps::ShellWindow* shell_window) OVERRIDE; 25 virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
25 virtual void OnShellWindowRemoved(apps::ShellWindow* shell_window) OVERRIDE; 26 virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
26 27
27 private: 28 private:
28 typedef std::vector<apps::ShellWindow*> ShellWindowList; 29 typedef std::vector<apps::AppWindow*> AppWindowList;
29 typedef std::vector<apps::ShellWindowRegistry*> ShellWindowRegistryList; 30 typedef std::vector<apps::AppWindowRegistry*> AppWindowRegistryList;
30 31
31 // A list of all shell windows for all users. 32 // A list of all app windows for all users.
32 ShellWindowList shell_window_list_; 33 AppWindowList app_window_list_;
33 34
34 // A list of the shell window registries which we additionally observe. 35 // A list of the app window registries which we additionally observe.
35 ShellWindowRegistryList multi_user_registry_; 36 AppWindowRegistryList multi_user_registry_;
36 37
37 DISALLOW_COPY_AND_ASSIGN(MultiProfileShellWindowLauncherController); 38 DISALLOW_COPY_AND_ASSIGN(MultiProfileShellWindowLauncherController);
38 }; 39 };
39 40
40 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CO NTROLLER_H_ 41 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CO NTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698