| OLD | NEW |
| 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "build/build_config.h" |
| 12 #include "components/mus/public/cpp/scoped_window_ptr.h" | 13 #include "components/mus/public/cpp/scoped_window_ptr.h" |
| 13 #include "components/mus/public/cpp/window.h" | 14 #include "components/mus/public/cpp/window.h" |
| 14 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
| 15 #include "content/browser/web_contents/web_contents_view.h" | 16 #include "content/browser/web_contents/web_contents_view.h" |
| 16 #include "content/common/content_export.h" | 17 #include "content/common/content_export.h" |
| 17 #include "content/common/drag_event_source_info.h" | 18 #include "content/common/drag_event_source_info.h" |
| 18 #include "ui/aura/window_delegate.h" | 19 #include "ui/aura/window_delegate.h" |
| 19 | 20 |
| 20 namespace content { | 21 namespace content { |
| 21 | 22 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 scoped_ptr<WebContentsViewDelegate> delegate_; | 110 scoped_ptr<WebContentsViewDelegate> delegate_; |
| 110 scoped_ptr<aura::Window> aura_window_; | 111 scoped_ptr<aura::Window> aura_window_; |
| 111 scoped_ptr<mus::ScopedWindowPtr> mus_window_; | 112 scoped_ptr<mus::ScopedWindowPtr> mus_window_; |
| 112 | 113 |
| 113 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); | 114 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); |
| 114 }; | 115 }; |
| 115 | 116 |
| 116 } // namespace content | 117 } // namespace content |
| 117 | 118 |
| 118 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
| OLD | NEW |