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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 base::Bind(&PermissionServiceContext::CreateService, 1800 base::Bind(&PermissionServiceContext::CreateService,
1801 base::Unretained(permission_service_context_.get()))); 1801 base::Unretained(permission_service_context_.get())));
1802 1802
1803 GetServiceRegistry()->AddService<presentation::PresentationService>( 1803 GetServiceRegistry()->AddService<presentation::PresentationService>(
1804 base::Bind(&PresentationServiceImpl::CreateMojoService, 1804 base::Bind(&PresentationServiceImpl::CreateMojoService,
1805 base::Unretained(this))); 1805 base::Unretained(this)));
1806 1806
1807 if (!frame_mojo_shell_) 1807 if (!frame_mojo_shell_)
1808 frame_mojo_shell_.reset(new FrameMojoShell(this)); 1808 frame_mojo_shell_.reset(new FrameMojoShell(this));
1809 1809
1810 GetServiceRegistry()->AddService<mojo::Shell>(base::Bind( 1810 GetServiceRegistry()->AddService<mojo::shell::mojom::Shell>(base::Bind(
1811 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get()))); 1811 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get())));
1812 1812
1813 #if defined(ENABLE_WEBVR) 1813 #if defined(ENABLE_WEBVR)
1814 const base::CommandLine& browser_command_line = 1814 const base::CommandLine& browser_command_line =
1815 *base::CommandLine::ForCurrentProcess(); 1815 *base::CommandLine::ForCurrentProcess();
1816 1816
1817 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) { 1817 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
1818 GetServiceRegistry()->AddService<VRService>( 1818 GetServiceRegistry()->AddService<VRService>(
1819 base::Bind(&VRDeviceManager::BindRequest)); 1819 base::Bind(&VRDeviceManager::BindRequest));
1820 } 1820 }
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 *dst = src; 2553 *dst = src;
2554 2554
2555 if (src.routing_id != -1) 2555 if (src.routing_id != -1)
2556 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2556 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2557 2557
2558 if (src.parent_routing_id != -1) 2558 if (src.parent_routing_id != -1)
2559 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2559 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2560 } 2560 }
2561 2561
2562 } // namespace content 2562 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.cc ('k') | content/browser/mojo/mojo_shell_client_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698