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

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

Issue 1743473002: Change Mojo URLs to structured names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@18collapse
Patch Set: . Created 4 years, 9 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/shell/browser/shell_content_browser_client.h" 5 #include "content/shell/browser/shell_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 #if defined(OS_WIN) || defined(OS_MACOSX) 212 #if defined(OS_WIN) || defined(OS_MACOSX)
213 return true; 213 return true;
214 #else 214 #else
215 return false; 215 return false;
216 #endif 216 #endif
217 } 217 }
218 218
219 void ShellContentBrowserClient::RegisterInProcessMojoApplications( 219 void ShellContentBrowserClient::RegisterInProcessMojoApplications(
220 StaticMojoApplicationMap* apps) { 220 StaticMojoApplicationMap* apps) {
221 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 221 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
222 apps->insert(std::make_pair(GURL("mojo:media"), 222 apps->insert(std::make_pair("mojo:media",
223 base::Bind(&media::CreateMojoMediaApplication))); 223 base::Bind(&media::CreateMojoMediaApplication)));
224 #endif 224 #endif
225 } 225 }
226 226
227 void ShellContentBrowserClient::RegisterOutOfProcessMojoApplications( 227 void ShellContentBrowserClient::RegisterOutOfProcessMojoApplications(
228 OutOfProcessMojoApplicationMap* apps) { 228 OutOfProcessMojoApplicationMap* apps) {
229 apps->insert(std::make_pair(GURL(kTestMojoAppUrl), 229 apps->insert(std::make_pair(kTestMojoAppUrl,
230 base::UTF8ToUTF16("Test Mojo App"))); 230 base::UTF8ToUTF16("Test Mojo App")));
231 } 231 }
232 232
233 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( 233 void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
234 base::CommandLine* command_line, 234 base::CommandLine* command_line,
235 int child_process_id) { 235 int child_process_id) {
236 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 236 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
237 switches::kDumpLineBoxTrees)) { 237 switches::kDumpLineBoxTrees)) {
238 command_line->AppendSwitch(switches::kDumpLineBoxTrees); 238 command_line->AppendSwitch(switches::kDumpLineBoxTrees);
239 } 239 }
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 ShellBrowserContext* 421 ShellBrowserContext*
422 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 422 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
423 BrowserContext* content_browser_context) { 423 BrowserContext* content_browser_context) {
424 if (content_browser_context == browser_context()) 424 if (content_browser_context == browser_context())
425 return browser_context(); 425 return browser_context();
426 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 426 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
427 return off_the_record_browser_context(); 427 return off_the_record_browser_context();
428 } 428 }
429 429
430 } // namespace content 430 } // namespace content
OLDNEW
« no previous file with comments | « content/public/utility/content_utility_client.h ('k') | content/shell/utility/shell_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698