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

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

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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/mirror_window_test_api.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 51 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
52 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 52 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
53 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 53 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
54 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 54 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
55 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 55 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
56 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; 56 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;
57 virtual ui::MenuModel* CreateContextMenu( 57 virtual ui::MenuModel* CreateContextMenu(
58 aura::Window* root, 58 aura::Window* root,
59 ash::ShelfItemDelegate* item_delegate, 59 ash::ShelfItemDelegate* item_delegate,
60 ash::ShelfItem* item) OVERRIDE; 60 ash::ShelfItem* item) OVERRIDE;
61 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
62 virtual GPUSupport* CreateGPUSupport() OVERRIDE; 61 virtual GPUSupport* CreateGPUSupport() OVERRIDE;
63 virtual base::string16 GetProductName() const OVERRIDE; 62 virtual base::string16 GetProductName() const OVERRIDE;
64 63
65 int num_exit_requests() const { return num_exit_requests_; } 64 int num_exit_requests() const { return num_exit_requests_; }
66 65
67 TestSessionStateDelegate* test_session_state_delegate(); 66 TestSessionStateDelegate* test_session_state_delegate();
68 67
69 private: 68 private:
70 int num_exit_requests_; 69 int num_exit_requests_;
71 bool multi_profiles_enabled_; 70 bool multi_profiles_enabled_;
72 71
73 scoped_ptr<content::BrowserContext> active_browser_context_; 72 scoped_ptr<content::BrowserContext> active_browser_context_;
74 73
75 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. 74 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
76 75
77 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 76 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
78 }; 77 };
79 78
80 } // namespace test 79 } // namespace test
81 } // namespace ash 80 } // namespace ash
82 81
83 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 82 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/mirror_window_test_api.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698