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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 10384128: Quote WebPreferences in namespace webkit_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2012 Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_browsertest_mac.mm ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // Creates a new RenderView. The parent_hwnd specifies a HWND to use as the 180 // Creates a new RenderView. The parent_hwnd specifies a HWND to use as the
181 // parent of the WebView HWND that will be created. If this is a blocked 181 // parent of the WebView HWND that will be created. If this is a blocked
182 // popup or as a new tab, opener_id is the routing ID of the RenderView 182 // popup or as a new tab, opener_id is the routing ID of the RenderView
183 // responsible for creating this RenderView (corresponding to parent_hwnd). 183 // responsible for creating this RenderView (corresponding to parent_hwnd).
184 // |counter| is either a currently initialized counter, or NULL (in which case 184 // |counter| is either a currently initialized counter, or NULL (in which case
185 // we treat this RenderView as a top level window). 185 // we treat this RenderView as a top level window).
186 CONTENT_EXPORT static RenderViewImpl* Create( 186 CONTENT_EXPORT static RenderViewImpl* Create(
187 gfx::NativeViewId parent_hwnd, 187 gfx::NativeViewId parent_hwnd,
188 int32 opener_id, 188 int32 opener_id,
189 const content::RendererPreferences& renderer_prefs, 189 const content::RendererPreferences& renderer_prefs,
190 const WebPreferences& webkit_prefs, 190 const webkit_glue::WebPreferences& webkit_prefs,
191 SharedRenderViewCounter* counter, 191 SharedRenderViewCounter* counter,
192 int32 routing_id, 192 int32 routing_id,
193 int32 surface_id, 193 int32 surface_id,
194 int64 session_storage_namespace_id, 194 int64 session_storage_namespace_id,
195 const string16& frame_name, 195 const string16& frame_name,
196 bool is_renderer_created, 196 bool is_renderer_created,
197 bool swapped_out, 197 bool swapped_out,
198 int32 next_page_id, 198 int32 next_page_id,
199 const WebKit::WebScreenInfo& screen_info, 199 const WebKit::WebScreenInfo& screen_info,
200 bool guest, 200 bool guest,
201 AccessibilityMode accessibility_mode); 201 AccessibilityMode accessibility_mode);
202 202
203 // Returns the RenderViewImpl containing the given WebView. 203 // Returns the RenderViewImpl containing the given WebView.
204 CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview); 204 CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview);
205 205
206 // May return NULL when the view is closing. 206 // May return NULL when the view is closing.
207 CONTENT_EXPORT WebKit::WebView* webview() const; 207 CONTENT_EXPORT WebKit::WebView* webview() const;
208 208
209 // WebGraphicsContext3DSwapBuffersClient implementation. 209 // WebGraphicsContext3DSwapBuffersClient implementation.
210 210
211 // Called by a GraphicsContext associated with this view when swapbuffers 211 // Called by a GraphicsContext associated with this view when swapbuffers
212 // is posted, completes or is aborted. 212 // is posted, completes or is aborted.
213 virtual void OnViewContextSwapBuffersPosted() OVERRIDE; 213 virtual void OnViewContextSwapBuffersPosted() OVERRIDE;
214 virtual void OnViewContextSwapBuffersComplete() OVERRIDE; 214 virtual void OnViewContextSwapBuffersComplete() OVERRIDE;
215 virtual void OnViewContextSwapBuffersAborted() OVERRIDE; 215 virtual void OnViewContextSwapBuffersAborted() OVERRIDE;
216 216
217 int history_list_offset() const { return history_list_offset_; } 217 int history_list_offset() const { return history_list_offset_; }
218 218
219 const WebPreferences& webkit_preferences() const { 219 const webkit_glue::WebPreferences& webkit_preferences() const {
220 return webkit_preferences_; 220 return webkit_preferences_;
221 } 221 }
222 222
223 void set_send_content_state_immediately(bool value) { 223 void set_send_content_state_immediately(bool value) {
224 send_content_state_immediately_ = value; 224 send_content_state_immediately_ = value;
225 } 225 }
226 226
227 MediaStreamDispatcher* media_stream_dispatcher() { 227 MediaStreamDispatcher* media_stream_dispatcher() {
228 return media_stream_dispatcher_; 228 return media_stream_dispatcher_;
229 } 229 }
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 const WebKit::WebCString& data, 603 const WebKit::WebCString& data,
604 PageSerializationStatus status) OVERRIDE; 604 PageSerializationStatus status) OVERRIDE;
605 605
606 // content::RenderView implementation ---------------------------------------- 606 // content::RenderView implementation ----------------------------------------
607 607
608 virtual bool Send(IPC::Message* message) OVERRIDE; 608 virtual bool Send(IPC::Message* message) OVERRIDE;
609 virtual int GetRoutingID() const OVERRIDE; 609 virtual int GetRoutingID() const OVERRIDE;
610 virtual int GetPageId() const OVERRIDE; 610 virtual int GetPageId() const OVERRIDE;
611 virtual gfx::Size GetSize() const OVERRIDE; 611 virtual gfx::Size GetSize() const OVERRIDE;
612 virtual gfx::NativeViewId GetHostWindow() const OVERRIDE; 612 virtual gfx::NativeViewId GetHostWindow() const OVERRIDE;
613 virtual WebPreferences& GetWebkitPreferences() OVERRIDE; 613 virtual webkit_glue::WebPreferences& GetWebkitPreferences() OVERRIDE;
614 virtual WebKit::WebView* GetWebView() OVERRIDE; 614 virtual WebKit::WebView* GetWebView() OVERRIDE;
615 virtual WebKit::WebNode GetFocusedNode() const OVERRIDE; 615 virtual WebKit::WebNode GetFocusedNode() const OVERRIDE;
616 virtual WebKit::WebNode GetContextMenuNode() const OVERRIDE; 616 virtual WebKit::WebNode GetContextMenuNode() const OVERRIDE;
617 virtual bool IsEditableNode(const WebKit::WebNode& node) const OVERRIDE; 617 virtual bool IsEditableNode(const WebKit::WebNode& node) const OVERRIDE;
618 virtual WebKit::WebPlugin* CreatePlugin( 618 virtual WebKit::WebPlugin* CreatePlugin(
619 WebKit::WebFrame* frame, 619 WebKit::WebFrame* frame,
620 const webkit::WebPluginInfo& info, 620 const webkit::WebPluginInfo& info,
621 const WebKit::WebPluginParams& params) OVERRIDE; 621 const WebKit::WebPluginParams& params) OVERRIDE;
622 virtual void EvaluateScript(const string16& frame_xpath, 622 virtual void EvaluateScript(const string16& frame_xpath,
623 const string16& jscript, 623 const string16& jscript,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 736
737 enum ErrorPageType { 737 enum ErrorPageType {
738 DNS_ERROR, 738 DNS_ERROR,
739 HTTP_404, 739 HTTP_404,
740 CONNECTION_ERROR, 740 CONNECTION_ERROR,
741 }; 741 };
742 742
743 RenderViewImpl(gfx::NativeViewId parent_hwnd, 743 RenderViewImpl(gfx::NativeViewId parent_hwnd,
744 int32 opener_id, 744 int32 opener_id,
745 const content::RendererPreferences& renderer_prefs, 745 const content::RendererPreferences& renderer_prefs,
746 const WebPreferences& webkit_prefs, 746 const webkit_glue::WebPreferences& webkit_prefs,
747 SharedRenderViewCounter* counter, 747 SharedRenderViewCounter* counter,
748 int32 routing_id, 748 int32 routing_id,
749 int32 surface_id, 749 int32 surface_id,
750 int64 session_storage_namespace_id, 750 int64 session_storage_namespace_id,
751 const string16& frame_name, 751 const string16& frame_name,
752 bool is_renderer_created, 752 bool is_renderer_created,
753 bool swapped_out, 753 bool swapped_out,
754 int32 next_page_id, 754 int32 next_page_id,
755 const WebKit::WebScreenInfo& screen_info, 755 const WebKit::WebScreenInfo& screen_info,
756 bool guest, 756 bool guest,
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 void OnSetZoomLevel(double zoom_level); 905 void OnSetZoomLevel(double zoom_level);
906 void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level); 906 void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level);
907 void OnExitFullscreen(); 907 void OnExitFullscreen();
908 void OnShouldClose(); 908 void OnShouldClose();
909 void OnStop(); 909 void OnStop();
910 void OnStopFinding(content::StopFindAction action); 910 void OnStopFinding(content::StopFindAction action);
911 CONTENT_EXPORT void OnSwapOut(const ViewMsg_SwapOut_Params& params); 911 CONTENT_EXPORT void OnSwapOut(const ViewMsg_SwapOut_Params& params);
912 void OnThemeChanged(); 912 void OnThemeChanged();
913 void OnUndo(); 913 void OnUndo();
914 void OnUpdateTargetURLAck(); 914 void OnUpdateTargetURLAck();
915 CONTENT_EXPORT void OnUpdateWebPreferences(const WebPreferences& prefs); 915 CONTENT_EXPORT void OnUpdateWebPreferences(
916 const webkit_glue::WebPreferences& prefs);
916 917
917 #if defined(OS_MACOSX) 918 #if defined(OS_MACOSX)
918 void OnWindowFrameChanged(const gfx::Rect& window_frame, 919 void OnWindowFrameChanged(const gfx::Rect& window_frame,
919 const gfx::Rect& view_frame); 920 const gfx::Rect& view_frame);
920 CONTENT_EXPORT void OnSelectPopupMenuItem(int selected_index); 921 CONTENT_EXPORT void OnSelectPopupMenuItem(int selected_index);
921 #endif 922 #endif
922 void OnZoom(content::PageZoom zoom); 923 void OnZoom(content::PageZoom zoom);
923 void OnZoomFactor(content::PageZoom zoom, int zoom_center_x, 924 void OnZoomFactor(content::PageZoom zoom, int zoom_center_x,
924 int zoom_center_y); 925 int zoom_center_y);
925 926
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 // If |url| is empty, show |fallback_url|. 1027 // If |url| is empty, show |fallback_url|.
1027 void UpdateTargetURL(const GURL& url, const GURL& fallback_url); 1028 void UpdateTargetURL(const GURL& url, const GURL& fallback_url);
1028 1029
1029 // --------------------------------------------------------------------------- 1030 // ---------------------------------------------------------------------------
1030 // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put 1031 // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
1031 // it in the same order in the .cc file as it was in the header. 1032 // it in the same order in the .cc file as it was in the header.
1032 // --------------------------------------------------------------------------- 1033 // ---------------------------------------------------------------------------
1033 1034
1034 // Settings ------------------------------------------------------------------ 1035 // Settings ------------------------------------------------------------------
1035 1036
1036 WebPreferences webkit_preferences_; 1037 webkit_glue::WebPreferences webkit_preferences_;
1037 content::RendererPreferences renderer_preferences_; 1038 content::RendererPreferences renderer_preferences_;
1038 1039
1039 HostZoomLevels host_zoom_levels_; 1040 HostZoomLevels host_zoom_levels_;
1040 1041
1041 // Whether content state (such as form state, scroll position and page 1042 // Whether content state (such as form state, scroll position and page
1042 // contents) should be sent to the browser immediately. This is normally 1043 // contents) should be sent to the browser immediately. This is normally
1043 // false, but set to true by some tests. 1044 // false, but set to true by some tests.
1044 bool send_content_state_immediately_; 1045 bool send_content_state_immediately_;
1045 1046
1046 // Bitwise-ORed set of extra bindings that have been enabled. See 1047 // Bitwise-ORed set of extra bindings that have been enabled. See
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 // bunch of stuff, you should probably create a helper class and put your 1344 // bunch of stuff, you should probably create a helper class and put your
1344 // data and methods on that to avoid bloating RenderView more. You can 1345 // data and methods on that to avoid bloating RenderView more. You can
1345 // use the Observer interface to filter IPC messages and receive frame change 1346 // use the Observer interface to filter IPC messages and receive frame change
1346 // notifications. 1347 // notifications.
1347 // --------------------------------------------------------------------------- 1348 // ---------------------------------------------------------------------------
1348 1349
1349 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1350 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1350 }; 1351 };
1351 1352
1352 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1353 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest_mac.mm ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698