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

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

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)
Patch Set: Fix kInvalidShelfID typo. Created 4 years 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 <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 27 matching lines...) Expand all
38 void Launch(ash::ShelfID id, int event_flags) override; 38 void Launch(ash::ShelfID id, int event_flags) override;
39 void Close(ash::ShelfID id) override; 39 void Close(ash::ShelfID id) override;
40 bool IsOpen(ash::ShelfID id) override; 40 bool IsOpen(ash::ShelfID id) override;
41 bool IsPlatformApp(ash::ShelfID id) override; 41 bool IsPlatformApp(ash::ShelfID id) override;
42 void ActivateApp(const std::string& app_id, 42 void ActivateApp(const std::string& app_id,
43 ash::LaunchSource source, 43 ash::LaunchSource source,
44 int event_flags) override; 44 int event_flags) override;
45 extensions::LaunchType GetLaunchType(ash::ShelfID id) override; 45 extensions::LaunchType GetLaunchType(ash::ShelfID id) override;
46 void SetLauncherItemImage(ash::ShelfID shelf_id, 46 void SetLauncherItemImage(ash::ShelfID shelf_id,
47 const gfx::ImageSkia& image) override; 47 const gfx::ImageSkia& image) override;
48 bool IsWindowedAppInLauncher(const std::string& app_id) override;
49 void SetLaunchType(ash::ShelfID id, 48 void SetLaunchType(ash::ShelfID id,
50 extensions::LaunchType launch_type) override; 49 extensions::LaunchType launch_type) override;
51 void UpdateAppState(content::WebContents* contents, 50 void UpdateAppState(content::WebContents* contents,
52 AppState app_state) override; 51 AppState app_state) override;
53 ash::ShelfID GetShelfIDForWebContents( 52 ash::ShelfID GetShelfIDForWebContents(
54 content::WebContents* contents) override; 53 content::WebContents* contents) override;
55 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 54 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
56 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 55 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
57 ui::BaseWindow* window, 56 ui::BaseWindow* window,
58 bool allow_minimize) override; 57 bool allow_minimize) override;
(...skipping 30 matching lines...) Expand all
89 // Pin the items set in the current profile's preferences. 88 // Pin the items set in the current profile's preferences.
90 void PinAppsFromPrefs(); 89 void PinAppsFromPrefs();
91 90
92 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>> 91 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
93 app_id_to_item_delegate_; 92 app_id_to_item_delegate_;
94 93
95 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 94 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
96 }; 95 };
97 96
98 #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