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

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

Issue 2090133003: Moved methods that don't rely on internal state out of ChromeLauncherController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit changes Created 4 years, 5 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
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_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 const gfx::ImageSkia& image) override; 107 const gfx::ImageSkia& image) override;
108 bool IsWindowedAppInLauncher(const std::string& app_id) override; 108 bool IsWindowedAppInLauncher(const std::string& app_id) override;
109 void SetLaunchType(ash::ShelfID id, 109 void SetLaunchType(ash::ShelfID id,
110 extensions::LaunchType launch_type) override; 110 extensions::LaunchType launch_type) override;
111 Profile* GetProfile() override; 111 Profile* GetProfile() override;
112 void UpdateAppState(content::WebContents* contents, 112 void UpdateAppState(content::WebContents* contents,
113 AppState app_state) override; 113 AppState app_state) override;
114 ash::ShelfID GetShelfIDForWebContents( 114 ash::ShelfID GetShelfIDForWebContents(
115 content::WebContents* contents) override; 115 content::WebContents* contents) override;
116 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 116 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
117 const extensions::Extension* GetExtensionForAppID(
118 const std::string& app_id) const override;
119 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 117 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
120 ui::BaseWindow* window, 118 ui::BaseWindow* window,
121 bool allow_minimize) override; 119 bool allow_minimize) override;
122 void ActiveUserChanged(const std::string& user_email) override; 120 void ActiveUserChanged(const std::string& user_email) override;
123 void AdditionalUserAddedToSession(Profile* profile) override; 121 void AdditionalUserAddedToSession(Profile* profile) override;
124 ChromeLauncherAppMenuItems GetApplicationList(const ash::ShelfItem& item, 122 ChromeLauncherAppMenuItems GetApplicationList(const ash::ShelfItem& item,
125 int event_flags) override; 123 int event_flags) override;
126 std::vector<content::WebContents*> GetV1ApplicationsFromAppId( 124 std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
127 const std::string& app_id) override; 125 const std::string& app_id) override;
128 void ActivateShellApp(const std::string& app_id, int index) override; 126 void ActivateShellApp(const std::string& app_id, int index) override;
129 bool IsWebContentHandledByApplication(content::WebContents* web_contents, 127 bool IsWebContentHandledByApplication(content::WebContents* web_contents,
130 const std::string& app_id) override; 128 const std::string& app_id) override;
131 bool ContentCanBeHandledByGmailApp( 129 bool ContentCanBeHandledByGmailApp(
132 content::WebContents* web_contents) override; 130 content::WebContents* web_contents) override;
133 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 131 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
134 base::string16 GetAppListTitle( 132 base::string16 GetAppListTitle(
135 content::WebContents* web_contents) const override; 133 content::WebContents* web_contents) const override;
136 BrowserShortcutLauncherItemController* 134 BrowserShortcutLauncherItemController*
137 GetBrowserShortcutLauncherItemController() override; 135 GetBrowserShortcutLauncherItemController() override;
138 void MayUpdateBrowserShortcutItem() override; 136 void MayUpdateBrowserShortcutItem() override;
139 LauncherItemController* GetLauncherItemController( 137 LauncherItemController* GetLauncherItemController(
140 const ash::ShelfID id) override; 138 const ash::ShelfID id) override;
141 bool IsBrowserFromActiveUser(Browser* browser) override;
142 bool ShelfBoundsChangesProbablyWithUser( 139 bool ShelfBoundsChangesProbablyWithUser(
143 ash::Shelf* shelf, 140 ash::Shelf* shelf,
144 const std::string& user_id) const override; 141 const std::string& user_id) const override;
145 void OnUserProfileReadyToSwitch(Profile* profile) override; 142 void OnUserProfileReadyToSwitch(Profile* profile) override;
146 AppListControllerDelegate::Pinnable GetPinnable(
147 const std::string& app_id) override;
148 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 143 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
149 144
150 // Access to the BrowserStatusMonitor for tests. 145 // Access to the BrowserStatusMonitor for tests.
151 BrowserStatusMonitor* browser_status_monitor_for_test() { 146 BrowserStatusMonitor* browser_status_monitor_for_test() {
152 return browser_status_monitor_.get(); 147 return browser_status_monitor_.get();
153 } 148 }
154 149
155 // Access to the AppWindowLauncherController for tests. 150 // Access to the AppWindowLauncherController for tests.
156 AppWindowLauncherController* app_window_controller_for_test() { 151 AppWindowLauncherController* app_window_controller_for_test() {
157 return app_window_controllers_[0].get(); 152 return app_window_controllers_[0].get();
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // The list of running & un-pinned applications for different users on hidden 367 // The list of running & un-pinned applications for different users on hidden
373 // desktops. 368 // desktops.
374 typedef std::vector<std::string> RunningAppListIds; 369 typedef std::vector<std::string> RunningAppListIds;
375 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 370 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
376 RunningAppListIdMap last_used_running_application_order_; 371 RunningAppListIdMap last_used_running_application_order_;
377 372
378 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); 373 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
379 }; 374 };
380 375
381 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 376 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698