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

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

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. Created 4 years, 9 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // Each item of the list is a dictionary. The key |kAppIDPath| gives the 242 // Each item of the list is a dictionary. The key |kAppIDPath| gives the
243 // id of the app. 243 // id of the app.
244 void PersistPinnedState(); 244 void PersistPinnedState();
245 245
246 ash::ShelfModel* model(); 246 ash::ShelfModel* model();
247 247
248 // Accessor to the currently loaded profile. Note that in multi profile use 248 // Accessor to the currently loaded profile. Note that in multi profile use
249 // cases this might change over time. 249 // cases this might change over time.
250 Profile* profile(); 250 Profile* profile();
251 251
252 // Gets the shelf auto-hide behavior on |root_window|.
253 ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
254 aura::Window* root_window) const;
255
256 // Returns |true| if the user is allowed to modify the shelf auto-hide
257 // behavior on |root_window|.
258 bool CanUserModifyShelfAutoHideBehavior(aura::Window* root_window) const;
259
260 // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
261 // user is not allowed to modify the auto-hide behavior.
262 void ToggleShelfAutoHideBehavior(aura::Window* root_window);
263
264 // Notify the controller that the state of an non platform app's tabs 252 // Notify the controller that the state of an non platform app's tabs
265 // have changed, 253 // have changed,
266 void UpdateAppState(content::WebContents* contents, AppState app_state); 254 void UpdateAppState(content::WebContents* contents, AppState app_state);
267 255
268 // Returns ShelfID for |contents|. If |contents| is not an app or is not 256 // Returns ShelfID for |contents|. If |contents| is not an app or is not
269 // pinned, returns the id of browser shrotcut. 257 // pinned, returns the id of browser shrotcut.
270 ash::ShelfID GetShelfIDForWebContents(content::WebContents* contents); 258 ash::ShelfID GetShelfIDForWebContents(content::WebContents* contents);
271 259
272 // Limits application refocusing to urls that match |url| for |id|. 260 // Limits application refocusing to urls that match |url| for |id|.
273 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url); 261 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url);
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 // The list of running & un-pinned applications for different users on hidden 590 // The list of running & un-pinned applications for different users on hidden
603 // desktops. 591 // desktops.
604 typedef std::vector<std::string> RunningAppListIds; 592 typedef std::vector<std::string> RunningAppListIds;
605 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 593 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
606 RunningAppListIdMap last_used_running_application_order_; 594 RunningAppListIdMap last_used_running_application_order_;
607 595
608 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); 596 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
609 }; 597 };
610 598
611 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ 599 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698