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

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: 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
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
47 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 47 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
48 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 48 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
49 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 49 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
50 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; 50 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;
51 virtual ui::MenuModel* CreateContextMenu( 51 virtual ui::MenuModel* CreateContextMenu(
52 aura::Window* root, 52 aura::Window* root,
53 ash::ShelfItemDelegate* item_delegate, 53 ash::ShelfItemDelegate* item_delegate,
54 ash::ShelfItem* item) OVERRIDE; 54 ash::ShelfItem* item) OVERRIDE;
55 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
56 virtual GPUSupport* CreateGPUSupport() OVERRIDE; 55 virtual GPUSupport* CreateGPUSupport() OVERRIDE;
57 virtual base::string16 GetProductName() const OVERRIDE; 56 virtual base::string16 GetProductName() const OVERRIDE;
58 57
59 int num_exit_requests() const { return num_exit_requests_; } 58 int num_exit_requests() const { return num_exit_requests_; }
60 59
61 TestSessionStateDelegate* test_session_state_delegate(); 60 TestSessionStateDelegate* test_session_state_delegate();
62 61
63 private: 62 private:
64 int num_exit_requests_; 63 int num_exit_requests_;
65 bool multi_profiles_enabled_; 64 bool multi_profiles_enabled_;
66 65
67 scoped_ptr<content::BrowserContext> active_browser_context_; 66 scoped_ptr<content::BrowserContext> active_browser_context_;
68 67
69 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. 68 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
70 69
71 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 70 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
72 }; 71 };
73 72
74 } // namespace test 73 } // namespace test
75 } // namespace ash 74 } // namespace ash
76 75
77 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 76 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698