Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2621 matching lines...) Expand 10 before | Expand all | Expand 10 after
2632 DidCreateDocumentElement(frame)); 2632 DidCreateDocumentElement(frame));
2633 } 2633 }
2634 2634
2635 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame, 2635 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame,
2636 const blink::WebString& title, 2636 const blink::WebString& title,
2637 blink::WebTextDirection direction) { 2637 blink::WebTextDirection direction) {
2638 DCHECK(!frame_ || frame_ == frame); 2638 DCHECK(!frame_ || frame_ == frame);
2639 // Ignore all but top level navigations. 2639 // Ignore all but top level navigations.
2640 if (!frame->parent()) { 2640 if (!frame->parent()) {
2641 base::string16 title16 = title; 2641 base::string16 title16 = title;
2642 base::debug::TraceLog::GetInstance()->UpdateProcessLabel( 2642 base::trace_event::TraceLog::GetInstance()->UpdateProcessLabel(
2643 routing_id_, base::UTF16ToUTF8(title16)); 2643 routing_id_, base::UTF16ToUTF8(title16));
2644 2644
2645 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); 2645 base::string16 shortened_title = title16.substr(0, kMaxTitleChars);
2646 Send(new FrameHostMsg_UpdateTitle(routing_id_, 2646 Send(new FrameHostMsg_UpdateTitle(routing_id_,
2647 shortened_title, direction)); 2647 shortened_title, direction));
2648 } 2648 }
2649 2649
2650 // Also check whether we have new encoding name. 2650 // Also check whether we have new encoding name.
2651 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 2651 UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
2652 } 2652 }
(...skipping 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after
4474 4474
4475 #if defined(ENABLE_BROWSER_CDMS) 4475 #if defined(ENABLE_BROWSER_CDMS)
4476 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4476 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4477 if (!cdm_manager_) 4477 if (!cdm_manager_)
4478 cdm_manager_ = new RendererCdmManager(this); 4478 cdm_manager_ = new RendererCdmManager(this);
4479 return cdm_manager_; 4479 return cdm_manager_;
4480 } 4480 }
4481 #endif // defined(ENABLE_BROWSER_CDMS) 4481 #endif // defined(ENABLE_BROWSER_CDMS)
4482 4482
4483 } // namespace content 4483 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/devtools/v8_sampling_profiler_browsertest.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698