| 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 1356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1367 OnToggleFullscreen(false); | 1367 OnToggleFullscreen(false); |
| 1368 } | 1368 } |
| 1369 | 1369 |
| 1370 WebPreferences RenderViewHostImpl::GetWebkitPreferences() { | 1370 WebPreferences RenderViewHostImpl::GetWebkitPreferences() { |
| 1371 if (!web_preferences_.get()) { | 1371 if (!web_preferences_.get()) { |
| 1372 OnWebkitPreferencesChanged(); | 1372 OnWebkitPreferencesChanged(); |
| 1373 } | 1373 } |
| 1374 return *web_preferences_; | 1374 return *web_preferences_; |
| 1375 } | 1375 } |
| 1376 | 1376 |
| 1377 void RenderViewHostImpl::DisownOpener() { | |
| 1378 Send(new ViewMsg_DisownOpener(GetRoutingID())); | |
| 1379 } | |
| 1380 | |
| 1381 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { | 1377 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { |
| 1382 web_preferences_.reset(new WebPreferences(prefs)); | 1378 web_preferences_.reset(new WebPreferences(prefs)); |
| 1383 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); | 1379 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); |
| 1384 } | 1380 } |
| 1385 | 1381 |
| 1386 void RenderViewHostImpl::OnWebkitPreferencesChanged() { | 1382 void RenderViewHostImpl::OnWebkitPreferencesChanged() { |
| 1387 // This is defensive code to avoid infinite loops due to code run inside | 1383 // This is defensive code to avoid infinite loops due to code run inside |
| 1388 // UpdateWebkitPreferences() accidentally updating more preferences and thus | 1384 // UpdateWebkitPreferences() accidentally updating more preferences and thus |
| 1389 // calling back into this code. See crbug.com/398751 for one past example. | 1385 // calling back into this code. See crbug.com/398751 for one past example. |
| 1390 if (updating_web_preferences_) | 1386 if (updating_web_preferences_) |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1544 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1540 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1545 | 1541 |
| 1546 frame_tree->ResetForMainFrameSwap(); | 1542 frame_tree->ResetForMainFrameSwap(); |
| 1547 } | 1543 } |
| 1548 | 1544 |
| 1549 void RenderViewHostImpl::SelectWordAroundCaret() { | 1545 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1550 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1546 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1551 } | 1547 } |
| 1552 | 1548 |
| 1553 } // namespace content | 1549 } // namespace content |
| OLD | NEW |