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

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

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/command_line.h" 10 #include "base/command_line.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 const blink::WebString& name) { 604 const blink::WebString& name) {
605 RenderFrameImpl* child_render_frame = this; 605 RenderFrameImpl* child_render_frame = this;
606 long long child_frame_identifier = WebFrame::generateEmbedderIdentifier(); 606 long long child_frame_identifier = WebFrame::generateEmbedderIdentifier();
607 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) { 607 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
608 // Synchronously notify the browser of a child frame creation to get the 608 // Synchronously notify the browser of a child frame creation to get the
609 // routing_id for the RenderFrame. 609 // routing_id for the RenderFrame.
610 int routing_id; 610 int routing_id;
611 Send(new FrameHostMsg_CreateChildFrame(routing_id_, 611 Send(new FrameHostMsg_CreateChildFrame(routing_id_,
612 parent->identifier(), 612 parent->identifier(),
613 child_frame_identifier, 613 child_frame_identifier,
614 UTF16ToUTF8(name), 614 base::UTF16ToUTF8(name),
615 &routing_id)); 615 &routing_id));
616 child_render_frame = RenderFrameImpl::Create(render_view_, routing_id); 616 child_render_frame = RenderFrameImpl::Create(render_view_, routing_id);
617 } 617 }
618 618
619 blink::WebFrame* web_frame = WebFrame::create(child_render_frame, 619 blink::WebFrame* web_frame = WebFrame::create(child_render_frame,
620 child_frame_identifier); 620 child_frame_identifier);
621 621
622 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) { 622 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
623 g_child_frame_map.Get().insert( 623 g_child_frame_map.Get().insert(
624 std::make_pair(web_frame, child_render_frame)); 624 std::make_pair(web_frame, child_render_frame));
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 690
691 void RenderFrameImpl::didChangeName(blink::WebFrame* frame, 691 void RenderFrameImpl::didChangeName(blink::WebFrame* frame,
692 const blink::WebString& name) { 692 const blink::WebString& name) {
693 if (!render_view_->renderer_preferences_.report_frame_name_changes) 693 if (!render_view_->renderer_preferences_.report_frame_name_changes)
694 return; 694 return;
695 695
696 render_view_->Send( 696 render_view_->Send(
697 new ViewHostMsg_UpdateFrameName(render_view_->GetRoutingID(), 697 new ViewHostMsg_UpdateFrameName(render_view_->GetRoutingID(),
698 frame->identifier(), 698 frame->identifier(),
699 !frame->parent(), 699 !frame->parent(),
700 UTF16ToUTF8(name))); 700 base::UTF16ToUTF8(name)));
701 } 701 }
702 702
703 void RenderFrameImpl::didMatchCSS( 703 void RenderFrameImpl::didMatchCSS(
704 blink::WebFrame* frame, 704 blink::WebFrame* frame,
705 const blink::WebVector<blink::WebString>& newly_matching_selectors, 705 const blink::WebVector<blink::WebString>& newly_matching_selectors,
706 const blink::WebVector<blink::WebString>& stopped_matching_selectors) { 706 const blink::WebVector<blink::WebString>& stopped_matching_selectors) {
707 render_view_->didMatchCSS( 707 render_view_->didMatchCSS(
708 frame, newly_matching_selectors, stopped_matching_selectors); 708 frame, newly_matching_selectors, stopped_matching_selectors);
709 } 709 }
710 710
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { 1366 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
1367 observers_.AddObserver(observer); 1367 observers_.AddObserver(observer);
1368 } 1368 }
1369 1369
1370 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { 1370 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
1371 observer->RenderFrameGone(); 1371 observer->RenderFrameGone();
1372 observers_.RemoveObserver(observer); 1372 observers_.RemoveObserver(observer);
1373 } 1373 }
1374 1374
1375 } // namespace content 1375 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698