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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/content/shell_content_state.h
diff --git a/ash/content/shell_content_state.h b/ash/content/shell_content_state.h
index 3269a582855834444313c7469a1585b415ee2433..858eec1413762b86c9bfeddb3582bf209da4993c 100644
--- a/ash/content/shell_content_state.h
+++ b/ash/content/shell_content_state.h
@@ -6,12 +6,10 @@
#define ASH_CONTENT_SHELL_CONTENT_STATE_H_
#include "ash/content/ash_with_content_export.h"
+#include "ash/content/screen_orientation_delegate_chromeos.h"
#include "ash/public/cpp/session_types.h"
#include "base/macros.h"
-#if defined(OS_CHROMEOS)
-#include "ash/content/screen_orientation_delegate_chromeos.h"
-#endif
namespace aura {
class Window;
@@ -50,9 +48,7 @@ class ASH_WITH_CONTENT_EXPORT ShellContentState {
ShellContentState();
virtual ~ShellContentState();
-#if defined(OS_CHROMEOS)
ScreenOrientationDelegateChromeos orientation_delegate_;
-#endif
private:
static ShellContentState* instance_;
« 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