OLD | NEW |
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 "apps/launcher.h" | 5 #include "apps/launcher.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 if (!in_kiosk_mode) { | 321 if (!in_kiosk_mode) { |
322 LOG(ERROR) << "App with 'kiosk_only' attribute must be run in " | 322 LOG(ERROR) << "App with 'kiosk_only' attribute must be run in " |
323 << " ChromeOS kiosk mode."; | 323 << " ChromeOS kiosk mode."; |
324 NOTREACHED(); | 324 NOTREACHED(); |
325 return; | 325 return; |
326 } | 326 } |
327 } | 327 } |
328 | 328 |
329 #if defined(OS_WIN) | 329 #if defined(OS_WIN) |
330 base::CommandLine::StringType about_blank_url( | 330 base::CommandLine::StringType about_blank_url( |
331 base::ASCIIToWide(url::kAboutBlankURL)); | 331 base::ASCIIToUTF16(url::kAboutBlankURL)); |
332 #else | 332 #else |
333 base::CommandLine::StringType about_blank_url(url::kAboutBlankURL); | 333 base::CommandLine::StringType about_blank_url(url::kAboutBlankURL); |
334 #endif | 334 #endif |
335 base::CommandLine::StringVector args = command_line.GetArgs(); | 335 base::CommandLine::StringVector args = command_line.GetArgs(); |
336 // Browser tests will add about:blank to the command line. This should | 336 // Browser tests will add about:blank to the command line. This should |
337 // never be interpreted as a file to open, as doing so with an app that | 337 // never be interpreted as a file to open, as doing so with an app that |
338 // has write access will result in a file 'about' being created, which | 338 // has write access will result in a file 'about' being created, which |
339 // causes problems on the bots. | 339 // causes problems on the bots. |
340 if (args.empty() || (command_line.HasSwitch(switches::kTestType) && | 340 if (args.empty() || (command_line.HasSwitch(switches::kTestType) && |
341 args[0] == about_blank_url)) { | 341 args[0] == about_blank_url)) { |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 void LaunchPlatformAppWithUrl(Profile* profile, | 406 void LaunchPlatformAppWithUrl(Profile* profile, |
407 const Extension* extension, | 407 const Extension* extension, |
408 const std::string& handler_id, | 408 const std::string& handler_id, |
409 const GURL& url, | 409 const GURL& url, |
410 const GURL& referrer_url) { | 410 const GURL& referrer_url) { |
411 AppRuntimeEventRouter::DispatchOnLaunchedEventWithUrl( | 411 AppRuntimeEventRouter::DispatchOnLaunchedEventWithUrl( |
412 profile, extension, handler_id, url, referrer_url); | 412 profile, extension, handler_id, url, referrer_url); |
413 } | 413 } |
414 | 414 |
415 } // namespace apps | 415 } // namespace apps |
OLD | NEW |