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

Side by Side Diff: content/browser/web_contents/web_contents_view_android.h

Issue 2453213003: Have WebContentsViewAndroid own ViewAndroid (Closed)
Patch Set: fixed builds & rebased Created 4 years, 1 month 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 (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> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 11 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
12 #include "content/browser/web_contents/web_contents_view.h" 12 #include "content/browser/web_contents/web_contents_view.h"
13 #include "content/public/browser/web_contents_view_delegate.h" 13 #include "content/public/browser/web_contents_view_delegate.h"
14 #include "content/public/common/context_menu_params.h" 14 #include "content/public/common/context_menu_params.h"
15 #include "content/public/common/drop_data.h" 15 #include "content/public/common/drop_data.h"
16 #include "ui/android/view_android.h"
16 #include "ui/gfx/geometry/rect_f.h" 17 #include "ui/gfx/geometry/rect_f.h"
17 18
18 namespace content { 19 namespace content {
19 class ContentViewCoreImpl; 20 class ContentViewCoreImpl;
20 class WebContentsImpl; 21 class WebContentsImpl;
21 22
22 // Android-specific implementation of the WebContentsView. 23 // Android-specific implementation of the WebContentsView.
23 class WebContentsViewAndroid : public WebContentsView, 24 class WebContentsViewAndroid : public WebContentsView,
24 public RenderViewHostDelegateView { 25 public RenderViewHostDelegateView {
25 public: 26 public:
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 private: 93 private:
93 // The WebContents whose contents we display. 94 // The WebContents whose contents we display.
94 WebContentsImpl* web_contents_; 95 WebContentsImpl* web_contents_;
95 96
96 // ContentViewCoreImpl is our interface to the view system. 97 // ContentViewCoreImpl is our interface to the view system.
97 ContentViewCoreImpl* content_view_core_; 98 ContentViewCoreImpl* content_view_core_;
98 99
99 // Interface for extensions to WebContentsView. Used to show the context menu. 100 // Interface for extensions to WebContentsView. Used to show the context menu.
100 std::unique_ptr<WebContentsViewDelegate> delegate_; 101 std::unique_ptr<WebContentsViewDelegate> delegate_;
101 102
103 // The native view associated with the contents of the web.
104 ui::ViewAndroid view_;
105
102 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 106 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
103 }; 107 };
104 108
105 } // namespace content 109 } // namespace content
106 110
107 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 111 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698