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

Side by Side Diff: content/shell/browser/shell_content_browser_client.h

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: self review Created 5 years, 1 month 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 net::NetLog* GetNetLog() override; 66 net::NetLog* GetNetLog() override;
67 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context, 67 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
68 const GURL& current_url, 68 const GURL& current_url,
69 const GURL& new_url) override; 69 const GURL& new_url) override;
70 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 70 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
71 71
72 void OpenURL(BrowserContext* browser_context, 72 void OpenURL(BrowserContext* browser_context,
73 const OpenURLParams& params, 73 const OpenURLParams& params,
74 const base::Callback<void(WebContents*)>& callback) override; 74 const base::Callback<void(WebContents*)>& callback) override;
75 75
76 int GetDefaultEnabledBindingsForView(RenderViewHost* view) override;
77
76 #if defined(OS_ANDROID) 78 #if defined(OS_ANDROID)
77 void GetAdditionalMappedFilesForChildProcess( 79 void GetAdditionalMappedFilesForChildProcess(
78 const base::CommandLine& command_line, 80 const base::CommandLine& command_line,
79 int child_process_id, 81 int child_process_id,
80 content::FileDescriptorInfo* mappings, 82 content::FileDescriptorInfo* mappings,
81 std::map<int, base::MemoryMappedFile::Region>* regions) override; 83 std::map<int, base::MemoryMappedFile::Region>* regions) override;
82 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 84 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
83 void GetAdditionalMappedFilesForChildProcess( 85 void GetAdditionalMappedFilesForChildProcess(
84 const base::CommandLine& command_line, 86 const base::CommandLine& command_line,
85 int child_process_id, 87 int child_process_id,
(...skipping 26 matching lines...) Expand all
112 resource_dispatcher_host_delegate_; 114 resource_dispatcher_host_delegate_;
113 115
114 base::Closure select_client_certificate_callback_; 116 base::Closure select_client_certificate_callback_;
115 117
116 ShellBrowserMainParts* shell_browser_main_parts_; 118 ShellBrowserMainParts* shell_browser_main_parts_;
117 }; 119 };
118 120
119 } // namespace content 121 } // namespace content
120 122
121 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 123 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698