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

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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/test/test_metro_viewer_process_host.cc ('k') | ash/test/test_shell_delegate.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_TEST_TEST_SHELL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; 44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; 51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;
52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
53 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE; 53 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;
54 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 54 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
55 virtual base::string16 GetProductName() const OVERRIDE; 55 virtual base::string16 GetProductName() const OVERRIDE;
56 56
57 int num_exit_requests() const { return num_exit_requests_; } 57 int num_exit_requests() const { return num_exit_requests_; }
58 58
59 TestSessionStateDelegate* test_session_state_delegate(); 59 TestSessionStateDelegate* test_session_state_delegate();
60 60
61 private: 61 private:
62 int num_exit_requests_; 62 int num_exit_requests_;
63 bool multi_profiles_enabled_; 63 bool multi_profiles_enabled_;
64 64
65 scoped_ptr<content::BrowserContext> active_browser_context_; 65 scoped_ptr<content::BrowserContext> active_browser_context_;
66 66
67 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. 67 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
68 68
69 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 69 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
70 }; 70 };
71 71
72 } // namespace test 72 } // namespace test
73 } // namespace ash 73 } // namespace ash
74 74
75 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 75 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_metro_viewer_process_host.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698