OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2163 didCommitProvisionalLoad(frame, item, commit_type); | 2163 didCommitProvisionalLoad(frame, item, commit_type); |
2164 } | 2164 } |
2165 | 2165 |
2166 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { | 2166 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { |
2167 DCHECK(!frame_ || frame_ == frame); | 2167 DCHECK(!frame_ || frame_ == frame); |
2168 // TODO(nasko): Move implementation here. Needed methods: | 2168 // TODO(nasko): Move implementation here. Needed methods: |
2169 // * StartNavStateSyncTimerIfNecessary | 2169 // * StartNavStateSyncTimerIfNecessary |
2170 render_view_->didUpdateCurrentHistoryItem(frame); | 2170 render_view_->didUpdateCurrentHistoryItem(frame); |
2171 } | 2171 } |
2172 | 2172 |
2173 void RenderFrameImpl::didChangeBrandColor() { | 2173 void RenderFrameImpl::didChangeThemeColor() { |
2174 if (frame_->parent()) | 2174 if (frame_->parent()) |
2175 return; | 2175 return; |
2176 | 2176 |
2177 Send(new FrameHostMsg_DidChangeBrandColor( | 2177 Send(new FrameHostMsg_DidChangeThemeColor( |
2178 routing_id_, frame_->document().brandColor())); | 2178 routing_id_, frame_->document().themeColor())); |
2179 } | 2179 } |
2180 | 2180 |
2181 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { | 2181 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { |
2182 return notification_provider_; | 2182 return notification_provider_; |
2183 } | 2183 } |
2184 | 2184 |
2185 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { | 2185 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { |
2186 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) | 2186 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) |
2187 return; | 2187 return; |
2188 | 2188 |
(...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3564 | 3564 |
3565 #if defined(ENABLE_BROWSER_CDMS) | 3565 #if defined(ENABLE_BROWSER_CDMS) |
3566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3567 if (!cdm_manager_) | 3567 if (!cdm_manager_) |
3568 cdm_manager_ = new RendererCdmManager(this); | 3568 cdm_manager_ = new RendererCdmManager(this); |
3569 return cdm_manager_; | 3569 return cdm_manager_; |
3570 } | 3570 } |
3571 #endif // defined(ENABLE_BROWSER_CDMS) | 3571 #endif // defined(ENABLE_BROWSER_CDMS) |
3572 | 3572 |
3573 } // namespace content | 3573 } // namespace content |
OLD | NEW |