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

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

Issue 1835403002: Support additional mash shelf alignments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 // it, the the window will get minimized instead. 268 // it, the the window will get minimized instead.
269 // Returns the action performed. Should be one of kNoAction, 269 // Returns the action performed. Should be one of kNoAction,
270 // kExistingWindowActivated, or kExistingWindowMinimized. 270 // kExistingWindowActivated, or kExistingWindowMinimized.
271 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 271 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
272 ui::BaseWindow* window, 272 ui::BaseWindow* window,
273 bool allow_minimize); 273 bool allow_minimize);
274 274
275 // ash::ShelfDelegate: 275 // ash::ShelfDelegate:
276 void OnShelfCreated(ash::Shelf* shelf) override; 276 void OnShelfCreated(ash::Shelf* shelf) override;
277 void OnShelfDestroyed(ash::Shelf* shelf) override; 277 void OnShelfDestroyed(ash::Shelf* shelf) override;
278 void OnAlignmentChanged(ash::ShelfAlignment alignment) override;
279 void OnAutoHideBehaviorChanged(ash::ShelfAutoHideBehavior auto_hide) override;
278 ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override; 280 ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
279 bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override; 281 bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
280 const std::string& GetAppIDForShelfID(ash::ShelfID id) override; 282 const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
281 bool GetAppIDForShelfIDConst(ash::ShelfID id, std::string* app_id) const; 283 bool GetAppIDForShelfIDConst(ash::ShelfID id, std::string* app_id) const;
282 void PinAppWithID(const std::string& app_id) override; 284 void PinAppWithID(const std::string& app_id) override;
283 bool IsAppPinned(const std::string& app_id) override; 285 bool IsAppPinned(const std::string& app_id) override;
284 void UnpinAppWithID(const std::string& app_id) override; 286 void UnpinAppWithID(const std::string& app_id) override;
285 287
286 // ash::ShelfItemDelegateManagerObserver: 288 // ash::ShelfItemDelegateManagerObserver:
287 void OnSetShelfItemDelegate(ash::ShelfID id, 289 void OnSetShelfItemDelegate(ash::ShelfID id,
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 // The list of running & un-pinned applications for different users on hidden 594 // The list of running & un-pinned applications for different users on hidden
593 // desktops. 595 // desktops.
594 typedef std::vector<std::string> RunningAppListIds; 596 typedef std::vector<std::string> RunningAppListIds;
595 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 597 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
596 RunningAppListIdMap last_used_running_application_order_; 598 RunningAppListIdMap last_used_running_application_order_;
597 599
598 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); 600 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
599 }; 601 };
600 602
601 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ 603 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698