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_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 11 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
11 #include "content/browser/web_contents/web_contents_view.h" | 12 #include "content/browser/web_contents/web_contents_view.h" |
12 #include "content/public/browser/web_contents_view_delegate.h" | 13 #include "content/public/browser/web_contents_view_delegate.h" |
13 #include "content/public/common/context_menu_params.h" | 14 #include "content/public/common/context_menu_params.h" |
14 #include "ui/gfx/geometry/rect_f.h" | 15 #include "ui/gfx/geometry/rect_f.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 class ContentViewCoreImpl; | 18 class ContentViewCoreImpl; |
18 class WebContentsImpl; | 19 class WebContentsImpl; |
19 | 20 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 void TakeFocus(bool reverse) override; | 77 void TakeFocus(bool reverse) override; |
77 | 78 |
78 private: | 79 private: |
79 // The WebContents whose contents we display. | 80 // The WebContents whose contents we display. |
80 WebContentsImpl* web_contents_; | 81 WebContentsImpl* web_contents_; |
81 | 82 |
82 // ContentViewCoreImpl is our interface to the view system. | 83 // ContentViewCoreImpl is our interface to the view system. |
83 ContentViewCoreImpl* content_view_core_; | 84 ContentViewCoreImpl* content_view_core_; |
84 | 85 |
85 // Interface for extensions to WebContentsView. Used to show the context menu. | 86 // Interface for extensions to WebContentsView. Used to show the context menu. |
86 scoped_ptr<WebContentsViewDelegate> delegate_; | 87 std::unique_ptr<WebContentsViewDelegate> delegate_; |
87 | 88 |
88 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); | 89 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); |
89 }; | 90 }; |
90 | 91 |
91 } // namespace content | 92 } // namespace content |
92 | 93 |
93 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ | 94 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ |
OLD | NEW |