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

Side by Side Diff: ash/shell_delegate.h

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « ash/shell/shell_delegate_impl.cc ('k') | 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 <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/magnifier/magnifier_constants.h" 11 #include "ash/magnifier/magnifier_constants.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 16
17 namespace app_list { 17 namespace app_list {
18 class AppListViewDelegate; 18 class AppListViewDelegate;
19 } 19 }
20 20
21 namespace aura { 21 namespace aura {
22 class RootWindow; 22 class RootWindow;
23 class Window; 23 class Window;
24 namespace client { 24 namespace client {
25 class StackingClient;
25 class UserActionClient; 26 class UserActionClient;
26 } 27 }
27 } 28 }
28 29
29 namespace ui { 30 namespace ui {
30 class MenuModel; 31 class MenuModel;
31 } 32 }
32 33
33 namespace views { 34 namespace views {
34 class Widget; 35 class Widget;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Saves the zoom scale of the full screen magnifier. 212 // Saves the zoom scale of the full screen magnifier.
212 virtual void SaveScreenMagnifierScale(double scale) = 0; 213 virtual void SaveScreenMagnifierScale(double scale) = 0;
213 214
214 // Gets a saved value of the zoom scale of full screen magnifier. If a value 215 // Gets a saved value of the zoom scale of full screen magnifier. If a value
215 // is not saved, return a negative value. 216 // is not saved, return a negative value.
216 virtual double GetSavedScreenMagnifierScale() = 0; 217 virtual double GetSavedScreenMagnifierScale() = 0;
217 218
218 // Creates a menu model of the context for the |root_window|. 219 // Creates a menu model of the context for the |root_window|.
219 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root_window) = 0; 220 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root_window) = 0;
220 221
222 // Creates the stacking client. Shell takes ownership of the object.
223 virtual aura::client::StackingClient* CreateStackingClient() = 0;
224
221 // Creates a root window host factory. Shell takes ownership of the returned 225 // Creates a root window host factory. Shell takes ownership of the returned
222 // value. 226 // value.
223 virtual RootWindowHostFactory* CreateRootWindowHostFactory() = 0; 227 virtual RootWindowHostFactory* CreateRootWindowHostFactory() = 0;
224 }; 228 };
225 229
226 } // namespace ash 230 } // namespace ash
227 231
228 #endif // ASH_SHELL_DELEGATE_H_ 232 #endif // ASH_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698