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

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

Issue 2523053004: Enhance chrome.app.window API for shelf integration with restore support (Closed)
Patch Set: Review v4 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_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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // Returns true if the specified item is for a platform app. 143 // Returns true if the specified item is for a platform app.
144 virtual bool IsPlatformApp(ash::ShelfID id) = 0; 144 virtual bool IsPlatformApp(ash::ShelfID id) = 0;
145 145
146 // Opens a new instance of the application identified by |app_id|. 146 // Opens a new instance of the application identified by |app_id|.
147 // Used by the app-list, and by pinned-app shelf items. 147 // Used by the app-list, and by pinned-app shelf items.
148 void LaunchApp(const std::string& app_id, 148 void LaunchApp(const std::string& app_id,
149 ash::LaunchSource source, 149 ash::LaunchSource source,
150 int event_flags); 150 int event_flags);
151 151
152 // As above but includes |launch_id|, an id that can be passed to an app when
153 // launched in order to support multiple shelf items per app.
154 void LaunchAppWithLaunchId(const std::string& app_id,
155 const std::string& launch_id,
156 ash::LaunchSource source,
157 int event_flags);
158
152 // If |app_id| is running, reactivates the app's most recently active window, 159 // If |app_id| is running, reactivates the app's most recently active window,
153 // otherwise launches and activates the app. 160 // otherwise launches and activates the app.
154 // Used by the app-list, and by pinned-app shelf items. 161 // Used by the app-list, and by pinned-app shelf items.
155 virtual void ActivateApp(const std::string& app_id, 162 virtual void ActivateApp(const std::string& app_id,
156 ash::LaunchSource source, 163 ash::LaunchSource source,
157 int event_flags) = 0; 164 int event_flags) = 0;
158 165
159 // Returns the launch type of app for the specified id. 166 // Returns the launch type of app for the specified id.
160 virtual extensions::LaunchType GetLaunchType(ash::ShelfID id) = 0; 167 virtual extensions::LaunchType GetLaunchType(ash::ShelfID id) = 0;
161 168
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // An observer that manages the shelf title and icon for settings windows. 324 // An observer that manages the shelf title and icon for settings windows.
318 SettingsWindowObserver settings_window_observer_; 325 SettingsWindowObserver settings_window_observer_;
319 326
320 // Used to load the images for app items. 327 // Used to load the images for app items.
321 std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_; 328 std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
322 329
323 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); 330 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
324 }; 331 };
325 332
326 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ 333 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698