| 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 1704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1715 } | 1715 } |
| 1716 | 1716 |
| 1717 webkit_glue::WebPreferences RenderViewHostImpl::GetWebkitPreferences() { | 1717 webkit_glue::WebPreferences RenderViewHostImpl::GetWebkitPreferences() { |
| 1718 return delegate_->GetWebkitPrefs(); | 1718 return delegate_->GetWebkitPrefs(); |
| 1719 } | 1719 } |
| 1720 | 1720 |
| 1721 void RenderViewHostImpl::UpdateFrameTree( | 1721 void RenderViewHostImpl::UpdateFrameTree( |
| 1722 int process_id, | 1722 int process_id, |
| 1723 int route_id, | 1723 int route_id, |
| 1724 const std::string& frame_tree) { | 1724 const std::string& frame_tree) { |
| 1725 DCHECK(false); |
| 1725 frame_tree_ = frame_tree; | 1726 frame_tree_ = frame_tree; |
| 1726 Send(new ViewMsg_UpdateFrameTree(GetRoutingID(), | 1727 Send(new ViewMsg_UpdateFrameTree(GetRoutingID(), |
| 1727 process_id, | 1728 process_id, |
| 1728 route_id, | 1729 route_id, |
| 1729 frame_tree_)); | 1730 frame_tree_)); |
| 1730 } | 1731 } |
| 1731 | 1732 |
| 1732 void RenderViewHostImpl::UpdateWebkitPreferences( | 1733 void RenderViewHostImpl::UpdateWebkitPreferences( |
| 1733 const webkit_glue::WebPreferences& prefs) { | 1734 const webkit_glue::WebPreferences& prefs) { |
| 1734 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); | 1735 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1974 // can cause navigations to be ignored in OnMsgNavigate. | 1975 // can cause navigations to be ignored in OnMsgNavigate. |
| 1975 is_waiting_for_beforeunload_ack_ = false; | 1976 is_waiting_for_beforeunload_ack_ = false; |
| 1976 is_waiting_for_unload_ack_ = false; | 1977 is_waiting_for_unload_ack_ = false; |
| 1977 } | 1978 } |
| 1978 | 1979 |
| 1979 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1980 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
| 1980 STLDeleteValues(&power_save_blockers_); | 1981 STLDeleteValues(&power_save_blockers_); |
| 1981 } | 1982 } |
| 1982 | 1983 |
| 1983 } // namespace content | 1984 } // namespace content |
| OLD | NEW |