OLD | NEW |
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_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 ->SetRenderFrameCreated(true); | 350 ->SetRenderFrameCreated(true); |
351 | 351 |
352 return true; | 352 return true; |
353 } | 353 } |
354 | 354 |
355 bool RenderViewHostImpl::IsRenderViewLive() const { | 355 bool RenderViewHostImpl::IsRenderViewLive() const { |
356 return GetProcess()->HasConnection() && renderer_initialized_; | 356 return GetProcess()->HasConnection() && renderer_initialized_; |
357 } | 357 } |
358 | 358 |
359 void RenderViewHostImpl::SyncRendererPrefs() { | 359 void RenderViewHostImpl::SyncRendererPrefs() { |
360 Send(new ViewMsg_SetRendererPrefs(GetRoutingID(), | 360 RendererPreferences renderer_preferences = |
361 delegate_->GetRendererPrefs( | 361 delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); |
362 GetProcess()->GetBrowserContext()))); | 362 #if defined(OS_WIN) |
| 363 GetWindowsSpecificPrefs(&renderer_preferences); |
| 364 #endif |
| 365 Send(new ViewMsg_SetRendererPrefs(GetRoutingID(), renderer_preferences)); |
363 } | 366 } |
364 | 367 |
365 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { | 368 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { |
366 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs"); | 369 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs"); |
367 WebPreferences prefs; | 370 WebPreferences prefs; |
368 | 371 |
369 const base::CommandLine& command_line = | 372 const base::CommandLine& command_line = |
370 *base::CommandLine::ForCurrentProcess(); | 373 *base::CommandLine::ForCurrentProcess(); |
371 | 374 |
372 prefs.web_security_enabled = | 375 prefs.web_security_enabled = |
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1423 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1426 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1424 | 1427 |
1425 frame_tree->ResetForMainFrameSwap(); | 1428 frame_tree->ResetForMainFrameSwap(); |
1426 } | 1429 } |
1427 | 1430 |
1428 void RenderViewHostImpl::SelectWordAroundCaret() { | 1431 void RenderViewHostImpl::SelectWordAroundCaret() { |
1429 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1432 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1430 } | 1433 } |
1431 | 1434 |
1432 } // namespace content | 1435 } // namespace content |
OLD | NEW |