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 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2367 blink::WebTextDirection direction) { | 2367 blink::WebTextDirection direction) { |
2368 DCHECK(!frame_ || frame_ == frame); | 2368 DCHECK(!frame_ || frame_ == frame); |
2369 // Ignore all but top level navigations. | 2369 // Ignore all but top level navigations. |
2370 if (!frame->parent()) { | 2370 if (!frame->parent()) { |
2371 base::string16 title16 = title; | 2371 base::string16 title16 = title; |
2372 base::debug::TraceLog::GetInstance()->UpdateProcessLabel( | 2372 base::debug::TraceLog::GetInstance()->UpdateProcessLabel( |
2373 routing_id_, base::UTF16ToUTF8(title16)); | 2373 routing_id_, base::UTF16ToUTF8(title16)); |
2374 | 2374 |
2375 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); | 2375 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); |
2376 Send(new FrameHostMsg_UpdateTitle(routing_id_, | 2376 Send(new FrameHostMsg_UpdateTitle(routing_id_, |
2377 render_view_->page_id_, | |
2378 shortened_title, direction)); | 2377 shortened_title, direction)); |
2379 } | 2378 } |
2380 | 2379 |
2381 // Also check whether we have new encoding name. | 2380 // Also check whether we have new encoding name. |
2382 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); | 2381 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
2383 } | 2382 } |
2384 | 2383 |
2385 void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame, | 2384 void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame, |
2386 blink::WebIconURL::Type icon_type) { | 2385 blink::WebIconURL::Type icon_type) { |
2387 DCHECK(!frame_ || frame_ == frame); | 2386 DCHECK(!frame_ || frame_ == frame); |
(...skipping 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4108 | 4107 |
4109 #if defined(ENABLE_BROWSER_CDMS) | 4108 #if defined(ENABLE_BROWSER_CDMS) |
4110 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4109 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4111 if (!cdm_manager_) | 4110 if (!cdm_manager_) |
4112 cdm_manager_ = new RendererCdmManager(this); | 4111 cdm_manager_ = new RendererCdmManager(this); |
4113 return cdm_manager_; | 4112 return cdm_manager_; |
4114 } | 4113 } |
4115 #endif // defined(ENABLE_BROWSER_CDMS) | 4114 #endif // defined(ENABLE_BROWSER_CDMS) |
4116 | 4115 |
4117 } // namespace content | 4116 } // namespace content |
OLD | NEW |