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

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

Issue 2453213003: Have WebContentsViewAndroid own ViewAndroid (Closed)
Patch Set: 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"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 private: 92 private:
93 // The WebContents whose contents we display. 93 // The WebContents whose contents we display.
94 WebContentsImpl* web_contents_; 94 WebContentsImpl* web_contents_;
95 95
96 // ContentViewCoreImpl is our interface to the view system. 96 // ContentViewCoreImpl is our interface to the view system.
97 ContentViewCoreImpl* content_view_core_; 97 ContentViewCoreImpl* content_view_core_;
98 98
99 // Interface for extensions to WebContentsView. Used to show the context menu. 99 // Interface for extensions to WebContentsView. Used to show the context menu.
100 std::unique_ptr<WebContentsViewDelegate> delegate_; 100 std::unique_ptr<WebContentsViewDelegate> delegate_;
101 101
102 // The native view associated with the contents of the web.
103 std::unique_ptr<ui::ViewAndroid> view_;
104
102 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 105 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
103 }; 106 };
104 107
105 } // namespace content 108 } // namespace content
106 109
107 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 110 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698