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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_MUS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 const gfx::ImageSkia& image) override; 51 const gfx::ImageSkia& image) override;
52 bool IsWindowedAppInLauncher(const std::string& app_id) override; 52 bool IsWindowedAppInLauncher(const std::string& app_id) override;
53 void SetLaunchType(ash::ShelfID id, 53 void SetLaunchType(ash::ShelfID id,
54 extensions::LaunchType launch_type) override; 54 extensions::LaunchType launch_type) override;
55 Profile* GetProfile() override; 55 Profile* GetProfile() override;
56 void UpdateAppState(content::WebContents* contents, 56 void UpdateAppState(content::WebContents* contents,
57 AppState app_state) override; 57 AppState app_state) override;
58 ash::ShelfID GetShelfIDForWebContents( 58 ash::ShelfID GetShelfIDForWebContents(
59 content::WebContents* contents) override; 59 content::WebContents* contents) override;
60 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 60 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
61 const extensions::Extension* GetExtensionForAppID(
62 const std::string& app_id) const override;
63 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 61 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
64 ui::BaseWindow* window, 62 ui::BaseWindow* window,
65 bool allow_minimize) override; 63 bool allow_minimize) override;
66 void ActiveUserChanged(const std::string& user_email) override; 64 void ActiveUserChanged(const std::string& user_email) override;
67 void AdditionalUserAddedToSession(Profile* profile) override; 65 void AdditionalUserAddedToSession(Profile* profile) override;
68 ChromeLauncherAppMenuItems GetApplicationList(const ash::ShelfItem& item, 66 ChromeLauncherAppMenuItems GetApplicationList(const ash::ShelfItem& item,
69 int event_flags) override; 67 int event_flags) override;
70 std::vector<content::WebContents*> GetV1ApplicationsFromAppId( 68 std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
71 const std::string& app_id) override; 69 const std::string& app_id) override;
72 void ActivateShellApp(const std::string& app_id, int index) override; 70 void ActivateShellApp(const std::string& app_id, int index) override;
73 bool IsWebContentHandledByApplication(content::WebContents* web_contents, 71 bool IsWebContentHandledByApplication(content::WebContents* web_contents,
74 const std::string& app_id) override; 72 const std::string& app_id) override;
75 bool ContentCanBeHandledByGmailApp( 73 bool ContentCanBeHandledByGmailApp(
76 content::WebContents* web_contents) override; 74 content::WebContents* web_contents) override;
77 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 75 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
78 base::string16 GetAppListTitle( 76 base::string16 GetAppListTitle(
79 content::WebContents* web_contents) const override; 77 content::WebContents* web_contents) const override;
80 BrowserShortcutLauncherItemController* 78 BrowserShortcutLauncherItemController*
81 GetBrowserShortcutLauncherItemController() override; 79 GetBrowserShortcutLauncherItemController() override;
82 void MayUpdateBrowserShortcutItem() override; 80 void MayUpdateBrowserShortcutItem() override;
83 LauncherItemController* GetLauncherItemController( 81 LauncherItemController* GetLauncherItemController(
84 const ash::ShelfID id) override; 82 const ash::ShelfID id) override;
85 bool IsBrowserFromActiveUser(Browser* browser) override;
86 bool ShelfBoundsChangesProbablyWithUser( 83 bool ShelfBoundsChangesProbablyWithUser(
87 ash::Shelf* shelf, 84 ash::Shelf* shelf,
88 const std::string& user_id) const override; 85 const std::string& user_id) const override;
89 void OnUserProfileReadyToSwitch(Profile* profile) override; 86 void OnUserProfileReadyToSwitch(Profile* profile) override;
90 AppListControllerDelegate::Pinnable GetPinnable(
91 const std::string& app_id) override;
92 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 87 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
93 88
94 private: 89 private:
95 ChromeLauncherControllerMus(); 90 ChromeLauncherControllerMus();
96 91
97 std::unique_ptr<ChromeMashShelfController> shelf_controller_; 92 std::unique_ptr<ChromeMashShelfController> shelf_controller_;
98 93
99 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 94 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
100 }; 95 };
101 96
102 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 97 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698