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

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

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 3 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 bool ContentCanBeHandledByGmailApp( 126 bool ContentCanBeHandledByGmailApp(
127 content::WebContents* web_contents) override; 127 content::WebContents* web_contents) override;
128 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 128 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
129 base::string16 GetAppListTitle( 129 base::string16 GetAppListTitle(
130 content::WebContents* web_contents) const override; 130 content::WebContents* web_contents) const override;
131 BrowserShortcutLauncherItemController* 131 BrowserShortcutLauncherItemController*
132 GetBrowserShortcutLauncherItemController() override; 132 GetBrowserShortcutLauncherItemController() override;
133 LauncherItemController* GetLauncherItemController( 133 LauncherItemController* GetLauncherItemController(
134 const ash::ShelfID id) override; 134 const ash::ShelfID id) override;
135 bool ShelfBoundsChangesProbablyWithUser( 135 bool ShelfBoundsChangesProbablyWithUser(
136 ash::Shelf* shelf, 136 ash::WmShelf* shelf,
137 const AccountId& account_id) const override; 137 const AccountId& account_id) const override;
138 void OnUserProfileReadyToSwitch(Profile* profile) override; 138 void OnUserProfileReadyToSwitch(Profile* profile) override;
139 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 139 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
140 140
141 // Access to the BrowserStatusMonitor for tests. 141 // Access to the BrowserStatusMonitor for tests.
142 BrowserStatusMonitor* browser_status_monitor_for_test() { 142 BrowserStatusMonitor* browser_status_monitor_for_test() {
143 return browser_status_monitor_.get(); 143 return browser_status_monitor_.get();
144 } 144 }
145 145
146 // Access to the AppWindowLauncherController for tests. 146 // Access to the AppWindowLauncherController for tests.
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 // The list of running & un-pinned applications for different users on hidden 354 // The list of running & un-pinned applications for different users on hidden
355 // desktops. 355 // desktops.
356 typedef std::vector<std::string> RunningAppListIds; 356 typedef std::vector<std::string> RunningAppListIds;
357 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 357 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
358 RunningAppListIdMap last_used_running_application_order_; 358 RunningAppListIdMap last_used_running_application_order_;
359 359
360 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); 360 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
361 }; 361 };
362 362
363 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 363 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698