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

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

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 21 matching lines...) Expand all
32 // and apps. It does this by way of LauncherUpdaters. 32 // and apps. It does this by way of LauncherUpdaters.
33 // TODO: rename this. ChromeLauncherDelegate is a poor name for what it actually 33 // TODO: rename this. ChromeLauncherDelegate is a poor name for what it actually
34 // does. 34 // does.
35 class ChromeLauncherDelegate : public ash::LauncherDelegate, 35 class ChromeLauncherDelegate : public ash::LauncherDelegate,
36 public ash::LauncherModelObserver, 36 public ash::LauncherModelObserver,
37 public content::NotificationObserver { 37 public content::NotificationObserver {
38 public: 38 public:
39 // Indicates what should happen when the app is launched. 39 // Indicates what should happen when the app is launched.
40 enum AppType { 40 enum AppType {
41 APP_TYPE_WINDOW, 41 APP_TYPE_WINDOW,
42 APP_TYPE_PANEL,
42 APP_TYPE_TAB 43 APP_TYPE_TAB
43 }; 44 };
44 45
45 // Interface used to load app icons. This is in it's own class so that it can 46 // Interface used to load app icons. This is in it's own class so that it can
46 // be mocked. 47 // be mocked.
47 class AppIconLoader { 48 class AppIconLoader {
48 public: 49 public:
49 virtual ~AppIconLoader() {} 50 virtual ~AppIconLoader() {}
50 51
51 // Returns the app id of the specified tab, or an empty string if there is 52 // Returns the app id of the specified tab, or an empty string if there is
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 219
219 // Used to load the image for an app tab. 220 // Used to load the image for an app tab.
220 scoped_ptr<AppIconLoader> app_icon_loader_; 221 scoped_ptr<AppIconLoader> app_icon_loader_;
221 222
222 content::NotificationRegistrar registrar_; 223 content::NotificationRegistrar registrar_;
223 224
224 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherDelegate); 225 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherDelegate);
225 }; 226 };
226 227
227 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 228 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698