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

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

Powered by Google App Engine
This is Rietveld 408576698