content/browser/frame_host/frame_mojo_shell.cc - Issue 1549113002: Switch to standard integer types in content/browser/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/frame_mojo_shell.h"	5 #include "content/browser/frame_host/frame_mojo_shell.h"

6	6

	7 #include "build/build_config.h"

7 #include "content/browser/mojo/mojo_shell_context.h"	8 #include "content/browser/mojo/mojo_shell_context.h"

8 #include "content/common/mojo/service_registry_impl.h"	9 #include "content/common/mojo/service_registry_impl.h"

9 #include "content/public/browser/content_browser_client.h"	10 #include "content/public/browser/content_browser_client.h"

10 #include "content/public/browser/render_frame_host.h"	11 #include "content/public/browser/render_frame_host.h"

11 #include "content/public/browser/site_instance.h"	12 #include "content/public/browser/site_instance.h"

12 #include "content/public/common/content_client.h"	13 #include "content/public/common/content_client.h"

13	14

14 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_MEDIA)	15 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_MEDIA)

15 #include "content/browser/media/android/provision_fetcher_impl.h"	16 #include "content/browser/media/android/provision_fetcher_impl.h"

16 #endif	17 #endif

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 // different services for different apps for better isolation.	76 // different services for different apps for better isolation.

76 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);	77 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);

77 GetContentClient()->browser()->RegisterFrameMojoShellServices(	78 GetContentClient()->browser()->RegisterFrameMojoShellServices(

78 service_registry_.get(), frame_host_);	79 service_registry_.get(), frame_host_);

79 }	80 }

80	81

81 return service_registry_.get();	82 return service_registry_.get();

82 }	83 }

83	84

84 } // namespace content	85 } // namespace content

OLD	NEW