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

Side by Side Diff: ash/test/content/test_shell_content_state.h

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_CONTENT_TEST_SHELL_CONTENT_STATE_H_ 5 #ifndef ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
6 #define ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_ 6 #define ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/content/shell_content_state.h" 10 #include "ash/content/shell_content_state.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace content { 13 namespace content {
14 class BrowserContext; 14 class BrowserContext;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 namespace test { 18 namespace test {
19 19
20 class TestShellContentState : public ShellContentState { 20 class TestShellContentState : public ShellContentState {
21 public: 21 public:
22 TestShellContentState(); 22 TestShellContentState();
23 23
24 #if defined(OS_CHROMEOS)
25 content::ScreenOrientationDelegate* screen_orientation_delegate() { 24 content::ScreenOrientationDelegate* screen_orientation_delegate() {
26 return &orientation_delegate_; 25 return &orientation_delegate_;
27 } 26 }
28 #endif
29 27
30 private: 28 private:
31 ~TestShellContentState() override; 29 ~TestShellContentState() override;
32 30
33 // Overridden from ShellContentState: 31 // Overridden from ShellContentState:
34 content::BrowserContext* GetActiveBrowserContext() override; 32 content::BrowserContext* GetActiveBrowserContext() override;
35 content::BrowserContext* GetBrowserContextByIndex(UserIndex index) override; 33 content::BrowserContext* GetBrowserContextByIndex(UserIndex index) override;
36 content::BrowserContext* GetBrowserContextForWindow( 34 content::BrowserContext* GetBrowserContextForWindow(
37 aura::Window* window) override; 35 aura::Window* window) override;
38 content::BrowserContext* GetUserPresentingBrowserContextForWindow( 36 content::BrowserContext* GetUserPresentingBrowserContextForWindow(
39 aura::Window* window) override; 37 aura::Window* window) override;
40 38
41 std::unique_ptr<content::BrowserContext> active_browser_context_; 39 std::unique_ptr<content::BrowserContext> active_browser_context_;
42 40
43 DISALLOW_COPY_AND_ASSIGN(TestShellContentState); 41 DISALLOW_COPY_AND_ASSIGN(TestShellContentState);
44 }; 42 };
45 43
46 } // namespace test 44 } // namespace test
47 } // namespace ash 45 } // namespace ash
48 46
49 #endif // ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_ 47 #endif // ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698