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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void Launch(ash::ShelfID id, int event_flags) override; 86 void Launch(ash::ShelfID id, int event_flags) override;
87 void Close(ash::ShelfID id) override; 87 void Close(ash::ShelfID id) override;
88 bool IsOpen(ash::ShelfID id) override; 88 bool IsOpen(ash::ShelfID id) override;
89 bool IsPlatformApp(ash::ShelfID id) override; 89 bool IsPlatformApp(ash::ShelfID id) override;
90 void ActivateApp(const std::string& app_id, 90 void ActivateApp(const std::string& app_id,
91 ash::LaunchSource source, 91 ash::LaunchSource source,
92 int event_flags) override; 92 int event_flags) override;
93 extensions::LaunchType GetLaunchType(ash::ShelfID id) override; 93 extensions::LaunchType GetLaunchType(ash::ShelfID id) override;
94 void SetLauncherItemImage(ash::ShelfID shelf_id, 94 void SetLauncherItemImage(ash::ShelfID shelf_id,
95 const gfx::ImageSkia& image) override; 95 const gfx::ImageSkia& image) override;
96 bool IsWindowedAppInLauncher(const std::string& app_id) override;
97 void SetLaunchType(ash::ShelfID id, 96 void SetLaunchType(ash::ShelfID id,
98 extensions::LaunchType launch_type) override; 97 extensions::LaunchType launch_type) override;
99 void UpdateAppState(content::WebContents* contents, 98 void UpdateAppState(content::WebContents* contents,
100 AppState app_state) override; 99 AppState app_state) override;
101 ash::ShelfID GetShelfIDForWebContents( 100 ash::ShelfID GetShelfIDForWebContents(
102 content::WebContents* contents) override; 101 content::WebContents* contents) override;
103 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 102 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
104 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 103 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
105 ui::BaseWindow* window, 104 ui::BaseWindow* window,
106 bool allow_minimize) override; 105 bool allow_minimize) override;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 typedef std::vector<std::string> RunningAppListIds; 319 typedef std::vector<std::string> RunningAppListIds;
321 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 320 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
322 RunningAppListIdMap last_used_running_application_order_; 321 RunningAppListIdMap last_used_running_application_order_;
323 322
324 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_; 323 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_;
325 324
326 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); 325 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
327 }; 326 };
328 327
329 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 328 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698