OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "apps/app_restore_service.h" | 10 #include "apps/app_restore_service.h" |
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 | 486 |
487 AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW); | 487 AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW); |
488 params.command_line = command_line_; | 488 params.command_line = command_line_; |
489 params.current_directory = cur_dir_; | 489 params.current_directory = cur_dir_; |
490 WebContents* tab_in_app_window = OpenApplication(params); | 490 WebContents* tab_in_app_window = OpenApplication(params); |
491 | 491 |
492 if (out_app_contents) | 492 if (out_app_contents) |
493 *out_app_contents = tab_in_app_window; | 493 *out_app_contents = tab_in_app_window; |
494 | 494 |
495 // Platform apps fire off a launch event which may or may not open a window. | 495 // Platform apps fire off a launch event which may or may not open a window. |
496 return (tab_in_app_window != NULL || extension->is_platform_app()); | 496 return (tab_in_app_window != NULL || CanLaunchViaEvent(extension)); |
497 } | 497 } |
498 | 498 |
499 if (url_string.empty()) | 499 if (url_string.empty()) |
500 return false; | 500 return false; |
501 | 501 |
502 #if defined(OS_WIN) // Fix up Windows shortcuts. | 502 #if defined(OS_WIN) // Fix up Windows shortcuts. |
503 ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%"); | 503 ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%"); |
504 #endif | 504 #endif |
505 GURL url(url_string); | 505 GURL url(url_string); |
506 | 506 |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 // If the first URL is the NTP, replace it with the sync promo. This | 933 // If the first URL is the NTP, replace it with the sync promo. This |
934 // behavior is desired because completing or skipping the sync promo | 934 // behavior is desired because completing or skipping the sync promo |
935 // causes a redirect to the NTP. | 935 // causes a redirect to the NTP. |
936 if (!startup_urls->empty() && IsNewTabURL(profile_, startup_urls->at(0))) | 936 if (!startup_urls->empty() && IsNewTabURL(profile_, startup_urls->at(0))) |
937 startup_urls->at(0) = sync_promo_url; | 937 startup_urls->at(0) = sync_promo_url; |
938 else | 938 else |
939 startup_urls->insert(startup_urls->begin(), sync_promo_url); | 939 startup_urls->insert(startup_urls->begin(), sync_promo_url); |
940 } | 940 } |
941 } | 941 } |
942 } | 942 } |
OLD | NEW |