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

Side by Side Diff: ash/content/shell_content_state.h

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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_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/common/session/session_types.h"
8 #include "ash/content/ash_with_content_export.h" 9 #include "ash/content/ash_with_content_export.h"
9 #include "ash/session/session_types.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 11
12 #if defined(OS_CHROMEOS) 12 #if defined(OS_CHROMEOS)
13 #include "ash/content/screen_orientation_delegate_chromeos.h" 13 #include "ash/content/screen_orientation_delegate_chromeos.h"
14 #endif 14 #endif
15 15
16 namespace aura { 16 namespace aura {
17 class Window; 17 class Window;
18 } 18 }
19 19
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 private: 57 private:
58 static ShellContentState* instance_; 58 static ShellContentState* instance_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(ShellContentState); 60 DISALLOW_COPY_AND_ASSIGN(ShellContentState);
61 }; 61 };
62 62
63 } // namespace ash 63 } // namespace ash
64 64
65 #endif // ASH_CONTENT_SHELL_CONTENT_STATE_H_ 65 #endif // ASH_CONTENT_SHELL_CONTENT_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698