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

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

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies Created 4 years, 4 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
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.
147 AppWindowLauncherController* app_window_controller_for_test() { 147 AppWindowLauncherController* app_window_controller_for_test() {
148 return app_window_controllers_[0].get(); 148 return app_window_controllers_[0].get();
149 } 149 }
150 150
151 // ash::ShelfDelegate: 151 // ash::ShelfDelegate:
152 void OnShelfCreated(ash::Shelf* shelf) override; 152 void OnShelfCreated(ash::WmShelf* shelf) override;
153 void OnShelfDestroyed(ash::Shelf* shelf) override; 153 void OnShelfDestroyed(ash::WmShelf* shelf) override;
154 void OnShelfAlignmentChanged(ash::Shelf* shelf) override; 154 void OnShelfAlignmentChanged(ash::WmShelf* shelf) override;
155 void OnShelfAutoHideBehaviorChanged(ash::Shelf* shelf) override; 155 void OnShelfAutoHideBehaviorChanged(ash::WmShelf* shelf) override;
156 void OnShelfAutoHideStateChanged(ash::Shelf* shelf) override; 156 void OnShelfAutoHideStateChanged(ash::WmShelf* shelf) override;
157 void OnShelfVisibilityStateChanged(ash::Shelf* shelf) override; 157 void OnShelfVisibilityStateChanged(ash::WmShelf* shelf) override;
158 ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override; 158 ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
159 bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override; 159 bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
160 const std::string& GetAppIDForShelfID(ash::ShelfID id) override; 160 const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
161 void PinAppWithID(const std::string& app_id) override; 161 void PinAppWithID(const std::string& app_id) override;
162 bool IsAppPinned(const std::string& app_id) override; 162 bool IsAppPinned(const std::string& app_id) override;
163 void UnpinAppWithID(const std::string& app_id) override; 163 void UnpinAppWithID(const std::string& app_id) override;
164 164
165 // LauncherAppUpdater::Delegate: 165 // LauncherAppUpdater::Delegate:
166 void OnAppInstalled(content::BrowserContext* browser_context, 166 void OnAppInstalled(content::BrowserContext* browser_context,
167 const std::string& app_id) override; 167 const std::string& app_id) override;
(...skipping 186 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
« no previous file with comments | « ash/test/test_shelf_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698