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

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

Issue 1211003006: [Extensions OOPI] Update app window bindings for OOPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 DCHECK(routing_id != MSG_ROUTING_NONE); 525 DCHECK(routing_id != MSG_ROUTING_NONE);
526 CreateParams params(render_view, routing_id); 526 CreateParams params(render_view, routing_id);
527 527
528 if (g_create_render_frame_impl) 528 if (g_create_render_frame_impl)
529 return g_create_render_frame_impl(params); 529 return g_create_render_frame_impl(params);
530 else 530 else
531 return new RenderFrameImpl(params); 531 return new RenderFrameImpl(params);
532 } 532 }
533 533
534 // static 534 // static
535 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int32 routing_id) { 535 RenderFrame* RenderFrame::FromRoutingID(int routing_id) {
536 return RenderFrameImpl::FromRoutingID(routing_id);
537 }
538
539 // static
540 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) {
536 RoutingIDFrameMap::iterator iter = 541 RoutingIDFrameMap::iterator iter =
537 g_routing_id_frame_map.Get().find(routing_id); 542 g_routing_id_frame_map.Get().find(routing_id);
538 if (iter != g_routing_id_frame_map.Get().end()) 543 if (iter != g_routing_id_frame_map.Get().end())
539 return iter->second; 544 return iter->second;
540 return NULL; 545 return NULL;
541 } 546 }
542 547
543 // static 548 // static
544 void RenderFrameImpl::CreateFrame( 549 void RenderFrameImpl::CreateFrame(
545 int routing_id, 550 int routing_id,
(...skipping 4464 matching lines...) Expand 10 before | Expand all | Expand 10 after
5010 void RenderFrameImpl::RegisterMojoServices() { 5015 void RenderFrameImpl::RegisterMojoServices() {
5011 // Only main frame have ImageDownloader service. 5016 // Only main frame have ImageDownloader service.
5012 if (!frame_->parent()) { 5017 if (!frame_->parent()) {
5013 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5018 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5014 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5019 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5015 base::Unretained(this))); 5020 base::Unretained(this)));
5016 } 5021 }
5017 } 5022 }
5018 5023
5019 } // namespace content 5024 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/render_frame.h ('k') | extensions/browser/api/app_window/app_window_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698