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

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

Issue 414423002: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed setHasPendingNavigationTransitionForTesting from CVC. Created 6 years, 4 months 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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 class WebContentsObserver; 68 class WebContentsObserver;
69 class WebContentsView; 69 class WebContentsView;
70 class WebContentsViewDelegate; 70 class WebContentsViewDelegate;
71 struct AXEventNotificationDetails; 71 struct AXEventNotificationDetails;
72 struct ColorSuggestion; 72 struct ColorSuggestion;
73 struct FaviconURL; 73 struct FaviconURL;
74 struct LoadNotificationDetails; 74 struct LoadNotificationDetails;
75 struct ResourceRedirectDetails; 75 struct ResourceRedirectDetails;
76 struct ResourceRequestDetails; 76 struct ResourceRequestDetails;
77 77
78 #if defined(OS_ANDROID)
79 class WebContentsAndroid;
80 #endif
81
78 // Factory function for the implementations that content knows about. Takes 82 // Factory function for the implementations that content knows about. Takes
79 // ownership of |delegate|. 83 // ownership of |delegate|.
80 WebContentsView* CreateWebContentsView( 84 WebContentsView* CreateWebContentsView(
81 WebContentsImpl* web_contents, 85 WebContentsImpl* web_contents,
82 WebContentsViewDelegate* delegate, 86 WebContentsViewDelegate* delegate,
83 RenderViewHostDelegateView** render_view_host_delegate_view); 87 RenderViewHostDelegateView** render_view_host_delegate_view);
84 88
85 class CONTENT_EXPORT WebContentsImpl 89 class CONTENT_EXPORT WebContentsImpl
86 : public NON_EXPORTED_BASE(WebContents), 90 : public NON_EXPORTED_BASE(WebContents),
87 public NON_EXPORTED_BASE(RenderFrameHostDelegate), 91 public NON_EXPORTED_BASE(RenderFrameHostDelegate),
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 const ImageDownloadCallback& callback) OVERRIDE; 325 const ImageDownloadCallback& callback) OVERRIDE;
322 virtual bool IsSubframe() const OVERRIDE; 326 virtual bool IsSubframe() const OVERRIDE;
323 virtual void Find(int request_id, 327 virtual void Find(int request_id,
324 const base::string16& search_text, 328 const base::string16& search_text,
325 const blink::WebFindOptions& options) OVERRIDE; 329 const blink::WebFindOptions& options) OVERRIDE;
326 virtual void StopFinding(StopFindAction action) OVERRIDE; 330 virtual void StopFinding(StopFindAction action) OVERRIDE;
327 virtual void InsertCSS(const std::string& css) OVERRIDE; 331 virtual void InsertCSS(const std::string& css) OVERRIDE;
328 #if defined(OS_ANDROID) 332 #if defined(OS_ANDROID)
329 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() 333 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents()
330 OVERRIDE; 334 OVERRIDE;
335 virtual WebContentsAndroid* GetWebContentsAndroid();
331 #elif defined(OS_MACOSX) 336 #elif defined(OS_MACOSX)
332 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; 337 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
333 virtual bool GetAllowOverlappingViews() OVERRIDE; 338 virtual bool GetAllowOverlappingViews() OVERRIDE;
334 virtual void SetAllowOtherViews(bool allow) OVERRIDE; 339 virtual void SetAllowOtherViews(bool allow) OVERRIDE;
335 virtual bool GetAllowOtherViews() OVERRIDE; 340 virtual bool GetAllowOtherViews() OVERRIDE;
336 #endif 341 #endif
337 342
338 // Implementation of PageNavigator. 343 // Implementation of PageNavigator.
339 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE; 344 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE;
340 345
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 // The accessibility mode for all frames. This is queried when each frame 1200 // The accessibility mode for all frames. This is queried when each frame
1196 // is created, and broadcast to all frames when it changes. 1201 // is created, and broadcast to all frames when it changes.
1197 AccessibilityMode accessibility_mode_; 1202 AccessibilityMode accessibility_mode_;
1198 1203
1199 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1204 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1200 }; 1205 };
1201 1206
1202 } // namespace content 1207 } // namespace content
1203 1208
1204 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1209 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_android.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698