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

Side by Side Diff: ash/launcher/launcher.h

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_LAUNCHER_LAUNCHER_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_H_
6 #define ASH_LAUNCHER_LAUNCHER_H_ 6 #define ASH_LAUNCHER_LAUNCHER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 24 matching lines...) Expand all
35 class FocusCycler; 35 class FocusCycler;
36 class ShelfLayoutManager; 36 class ShelfLayoutManager;
37 class ShelfView; 37 class ShelfView;
38 } 38 }
39 39
40 namespace test { 40 namespace test {
41 class LauncherTestAPI; 41 class LauncherTestAPI;
42 } 42 }
43 43
44 class LauncherDelegate; 44 class LauncherDelegate;
45 class LauncherModel;
46 class ShelfIconObserver; 45 class ShelfIconObserver;
46 class ShelfModel;
47 class ShelfWidget; 47 class ShelfWidget;
48 48
49 class ASH_EXPORT Launcher { 49 class ASH_EXPORT Launcher {
50 public: 50 public:
51 static const char kNativeViewName[]; 51 static const char kNativeViewName[];
52 52
53 Launcher(LauncherModel* launcher_model, 53 Launcher(ShelfModel* shelf_model,
54 LauncherDelegate* launcher_delegate, 54 LauncherDelegate* launcher_delegate,
55 ShelfWidget* shelf_widget); 55 ShelfWidget* shelf_widget);
56 virtual ~Launcher(); 56 virtual ~Launcher();
57 57
58 // Return the launcher for the primary display. NULL if no user is 58 // Return the launcher for the primary display. NULL if no user is
59 // logged in yet. 59 // logged in yet.
60 static Launcher* ForPrimaryDisplay(); 60 static Launcher* ForPrimaryDisplay();
61 61
62 // Return the launcher for the display that |window| is currently on, 62 // Return the launcher for the display that |window| is currently on,
63 // or a launcher on primary display if the launcher per display feature 63 // or a launcher on primary display if the launcher per display feature
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 LauncherDelegate* delegate_; 125 LauncherDelegate* delegate_;
126 126
127 ShelfWidget* shelf_widget_; 127 ShelfWidget* shelf_widget_;
128 128
129 DISALLOW_COPY_AND_ASSIGN(Launcher); 129 DISALLOW_COPY_AND_ASSIGN(Launcher);
130 }; 130 };
131 131
132 } // namespace ash 132 } // namespace ash
133 133
134 #endif // ASH_LAUNCHER_LAUNCHER_H_ 134 #endif // ASH_LAUNCHER_LAUNCHER_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698