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

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

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Address comments. Created 4 years, 2 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/common/shelf/shelf_item_delegate.h" 11 #include "ash/common/shelf/shelf_item_delegate.h"
12 #include "ash/common/shelf/shelf_item_types.h" 12 #include "ash/common/shelf/shelf_item_types.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 14 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h" 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
17 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
17 #include "extensions/common/constants.h" 18 #include "extensions/common/constants.h"
18 19
19 class AccountId; 20 class AccountId;
20 class ArcAppDeferredLauncherController; 21 class ArcAppDeferredLauncherController;
21 class Browser; 22 class Browser;
22 class BrowserShortcutLauncherItemController; 23 class BrowserShortcutLauncherItemController;
23 class GURL; 24 class GURL;
24 class LauncherItemController; 25 class LauncherItemController;
25 26
26 namespace ash { 27 namespace ash {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 243
243 // Controller to launch Arc apps in deferred mode. 244 // Controller to launch Arc apps in deferred mode.
244 virtual ArcAppDeferredLauncherController* GetArcDeferredLauncher() = 0; 245 virtual ArcAppDeferredLauncherController* GetArcDeferredLauncher() = 0;
245 246
246 protected: 247 protected:
247 ChromeLauncherController(); 248 ChromeLauncherController();
248 249
249 private: 250 private:
250 static ChromeLauncherController* instance_; 251 static ChromeLauncherController* instance_;
251 252
253 SettingsWindowObserver settings_window_observer_;
254
252 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); 255 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
253 }; 256 };
254 257
255 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ 258 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_status_monitor.cc ('k') | chrome/browser/ui/ash/launcher/settings_window_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698