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

Side by Side Diff: content/browser/renderer_host/render_view_host.cc

Issue 9302022: WebWidgetClient::screenInfo() no longer does a synchronous IPC. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 10 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
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 #include "content/browser/renderer_host/render_view_host.h" 5 #include "content/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ViewMsg_New_Params params; 190 ViewMsg_New_Params params;
191 params.parent_window = GetNativeViewId(); 191 params.parent_window = GetNativeViewId();
192 params.renderer_preferences = 192 params.renderer_preferences =
193 delegate_->GetRendererPrefs(process()->GetBrowserContext()); 193 delegate_->GetRendererPrefs(process()->GetBrowserContext());
194 params.web_preferences = delegate_->GetWebkitPrefs(); 194 params.web_preferences = delegate_->GetWebkitPrefs();
195 params.view_id = routing_id(); 195 params.view_id = routing_id();
196 params.surface_id = surface_id(); 196 params.surface_id = surface_id();
197 params.session_storage_namespace_id = session_storage_namespace_->id(); 197 params.session_storage_namespace_id = session_storage_namespace_->id();
198 params.frame_name = frame_name; 198 params.frame_name = frame_name;
199 params.next_page_id = next_page_id; 199 params.next_page_id = next_page_id;
200 #if defined(OS_POSIX) || defined(USE_AURA)
201 if (view())
202 view()->GetScreenInfo(&params.screen_info);
203 else
204 RenderWidgetHostView::GetDefaultScreenInfo(&params.screen_info);
205 #else
206 params.screen_info =
207 params.WebKit::WebScreenInfoFactory::screenInfo(
lain Merrick 2012/01/31 12:42:09 params.WebKit looks wrong. And this may still cal
Fady Samuel 2012/01/31 19:54:12 It probably is. I'm trying to update and test on W
208 gfx::NativeViewFromId(GetNativeViewId()));
209 #endif
210
200 Send(new ViewMsg_New(params)); 211 Send(new ViewMsg_New(params));
201 212
202 // If it's enabled, tell the renderer to set up the Javascript bindings for 213 // If it's enabled, tell the renderer to set up the Javascript bindings for
203 // sending messages back to the browser. 214 // sending messages back to the browser.
204 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_)); 215 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_));
205 // Let our delegate know that we created a RenderView. 216 // Let our delegate know that we created a RenderView.
206 delegate_->RenderViewCreated(this); 217 delegate_->RenderViewCreated(this);
207 218
208 FOR_EACH_OBSERVER( 219 FOR_EACH_OBSERVER(
209 content::RenderViewHostObserver, observers_, RenderViewHostInitialized()); 220 content::RenderViewHostObserver, observers_, RenderViewHostInitialized());
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 1545
1535 void RenderViewHost::OnWebUISend(const GURL& source_url, 1546 void RenderViewHost::OnWebUISend(const GURL& source_url,
1536 const std::string& name, 1547 const std::string& name,
1537 const base::ListValue& args) { 1548 const base::ListValue& args) {
1538 delegate_->WebUISend(this, source_url, name, args); 1549 delegate_->WebUISend(this, source_url, name, args);
1539 } 1550 }
1540 1551
1541 void RenderViewHost::ClearPowerSaveBlockers() { 1552 void RenderViewHost::ClearPowerSaveBlockers() {
1542 STLDeleteValues(&power_save_blockers_); 1553 STLDeleteValues(&power_save_blockers_);
1543 } 1554 }
OLDNEW
« no previous file with comments | « no previous file | content/common/view_messages.h » ('j') | content/renderer/render_widget_fullscreen.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698