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

Side by Side Diff: ash/content/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
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | ash/content/shell_content_state.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 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_CONTENT_SHELL_CONTENT_STATE_H_ 5 #ifndef ASH_CONTENT_SHELL_CONTENT_STATE_H_
6 #define ASH_CONTENT_SHELL_CONTENT_STATE_H_ 6 #define ASH_CONTENT_SHELL_CONTENT_STATE_H_
7 7
8 #include "ash/content/ash_with_content_export.h" 8 #include "ash/content/ash_with_content_export.h"
9 #include "ash/content/screen_orientation_delegate_chromeos.h"
9 #include "ash/public/cpp/session_types.h" 10 #include "ash/public/cpp/session_types.h"
10 #include "base/macros.h" 11 #include "base/macros.h"
11 12
12 #if defined(OS_CHROMEOS)
13 #include "ash/content/screen_orientation_delegate_chromeos.h"
14 #endif
15 13
16 namespace aura { 14 namespace aura {
17 class Window; 15 class Window;
18 } 16 }
19 17
20 namespace content { 18 namespace content {
21 class BrowserContext; 19 class BrowserContext;
22 } 20 }
23 21
24 namespace ash { 22 namespace ash {
(...skipping 18 matching lines...) Expand all
43 41
44 // Returns the browser context on which the window is currently shown. NULL 42 // Returns the browser context on which the window is currently shown. NULL
45 // means the window will be shown for every user. 43 // means the window will be shown for every user.
46 virtual content::BrowserContext* GetUserPresentingBrowserContextForWindow( 44 virtual content::BrowserContext* GetUserPresentingBrowserContextForWindow(
47 aura::Window* window) = 0; 45 aura::Window* window) = 0;
48 46
49 protected: 47 protected:
50 ShellContentState(); 48 ShellContentState();
51 virtual ~ShellContentState(); 49 virtual ~ShellContentState();
52 50
53 #if defined(OS_CHROMEOS)
54 ScreenOrientationDelegateChromeos orientation_delegate_; 51 ScreenOrientationDelegateChromeos orientation_delegate_;
55 #endif
56 52
57 private: 53 private:
58 static ShellContentState* instance_; 54 static ShellContentState* instance_;
59 55
60 DISALLOW_COPY_AND_ASSIGN(ShellContentState); 56 DISALLOW_COPY_AND_ASSIGN(ShellContentState);
61 }; 57 };
62 58
63 } // namespace ash 59 } // namespace ash
64 60
65 #endif // ASH_CONTENT_SHELL_CONTENT_STATE_H_ 61 #endif // ASH_CONTENT_SHELL_CONTENT_STATE_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | ash/content/shell_content_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698