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 <memory> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "components/mus/public/cpp/scoped_window_ptr.h" | 13 #include "components/mus/public/cpp/scoped_window_ptr.h" |
14 #include "components/mus/public/cpp/window.h" | 14 #include "components/mus/public/cpp/window.h" |
15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
16 #include "content/browser/web_contents/web_contents_view.h" | 16 #include "content/browser/web_contents/web_contents_view.h" |
17 #include "content/common/content_export.h" | 17 #include "content/common/content_export.h" |
18 #include "content/common/drag_event_source_info.h" | 18 #include "content/common/drag_event_source_info.h" |
19 #include "ui/aura/window_delegate.h" | 19 #include "ui/aura/window_delegate.h" |
20 | 20 |
21 namespace content { | 21 namespace content { |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 void OnDeviceScaleFactorChanged(float device_scale_factor) override; | 100 void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
101 void OnWindowDestroying(aura::Window* window) override; | 101 void OnWindowDestroying(aura::Window* window) override; |
102 void OnWindowDestroyed(aura::Window* window) override; | 102 void OnWindowDestroyed(aura::Window* window) override; |
103 void OnWindowTargetVisibilityChanged(bool visible) override; | 103 void OnWindowTargetVisibilityChanged(bool visible) override; |
104 bool HasHitTestMask() const override; | 104 bool HasHitTestMask() const override; |
105 void GetHitTestMask(gfx::Path* mask) const override; | 105 void GetHitTestMask(gfx::Path* mask) const override; |
106 | 106 |
107 // The WebContentsImpl whose contents we display. | 107 // The WebContentsImpl whose contents we display. |
108 WebContentsImpl* web_contents_; | 108 WebContentsImpl* web_contents_; |
109 | 109 |
110 scoped_ptr<WebContentsViewDelegate> delegate_; | 110 std::unique_ptr<WebContentsViewDelegate> delegate_; |
111 scoped_ptr<aura::Window> aura_window_; | 111 std::unique_ptr<aura::Window> aura_window_; |
112 scoped_ptr<mus::ScopedWindowPtr> mus_window_; | 112 std::unique_ptr<mus::ScopedWindowPtr> mus_window_; |
113 | 113 |
114 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); | 114 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); |
115 }; | 115 }; |
116 | 116 |
117 } // namespace content | 117 } // namespace content |
118 | 118 |
119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
OLD | NEW |