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

Side by Side Diff: trunk/src/ash/shell_delegate.h

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.cc ('k') | trunk/src/ash/test/test_shell_delegate.h » ('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_SHELL_DELEGATE_H_ 5 #ifndef ASH_SHELL_DELEGATE_H_
6 #define ASH_SHELL_DELEGATE_H_ 6 #define ASH_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 14
15 namespace app_list { 15 namespace app_list {
16 class AppListViewDelegate; 16 class AppListViewDelegate;
17 } 17 }
18 18
19 namespace aura { 19 namespace aura {
20 class RootWindow; 20 class RootWindow;
21 class Window; 21 class Window;
22 namespace client {
23 class UserActionClient;
24 }
22 } 25 }
23 26
24 namespace content { 27 namespace content {
25 class BrowserContext; 28 class BrowserContext;
26 } 29 }
27 30
28 namespace ui { 31 namespace ui {
29 class MenuModel; 32 class MenuModel;
30 } 33 }
31 34
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 116
114 // Creates a accessibility delegate. Shell takes ownership of the delegate. 117 // Creates a accessibility delegate. Shell takes ownership of the delegate.
115 virtual AccessibilityDelegate* CreateAccessibilityDelegate() = 0; 118 virtual AccessibilityDelegate* CreateAccessibilityDelegate() = 0;
116 119
117 // Creates an application delegate. Shell takes ownership of the delegate. 120 // Creates an application delegate. Shell takes ownership of the delegate.
118 virtual NewWindowDelegate* CreateNewWindowDelegate() = 0; 121 virtual NewWindowDelegate* CreateNewWindowDelegate() = 0;
119 122
120 // Creates a media delegate. Shell takes ownership of the delegate. 123 // Creates a media delegate. Shell takes ownership of the delegate.
121 virtual MediaDelegate* CreateMediaDelegate() = 0; 124 virtual MediaDelegate* CreateMediaDelegate() = 0;
122 125
126 // Creates a user action client. Shell takes ownership of the object.
127 virtual aura::client::UserActionClient* CreateUserActionClient() = 0;
128
123 // Creates a menu model of the context for the |root_window|. 129 // Creates a menu model of the context for the |root_window|.
124 // When a ContextMenu is used for an item created by ShelfWindowWatcher, 130 // When a ContextMenu is used for an item created by ShelfWindowWatcher,
125 // passes its ShelfItemDelegate and ShelfItem. 131 // passes its ShelfItemDelegate and ShelfItem.
126 virtual ui::MenuModel* CreateContextMenu( 132 virtual ui::MenuModel* CreateContextMenu(
127 aura::Window* root_window, 133 aura::Window* root_window,
128 ash::ShelfItemDelegate* item_delegate, 134 ash::ShelfItemDelegate* item_delegate,
129 ash::ShelfItem* item) = 0; 135 ash::ShelfItem* item) = 0;
130 136
131 // Creates a root window host factory. Shell takes ownership of the returned 137 // Creates a root window host factory. Shell takes ownership of the returned
132 // value. 138 // value.
133 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() = 0; 139 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() = 0;
134 140
135 // Creates a GPU support object. Shell takes ownership of the object. 141 // Creates a GPU support object. Shell takes ownership of the object.
136 virtual GPUSupport* CreateGPUSupport() = 0; 142 virtual GPUSupport* CreateGPUSupport() = 0;
137 143
138 // Get the product name. 144 // Get the product name.
139 virtual base::string16 GetProductName() const = 0; 145 virtual base::string16 GetProductName() const = 0;
140 }; 146 };
141 147
142 } // namespace ash 148 } // namespace ash
143 149
144 #endif // ASH_SHELL_DELEGATE_H_ 150 #endif // ASH_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.cc ('k') | trunk/src/ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698