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.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "apps/app_load_service.h" | 10 #include "apps/app_load_service.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 #include "chrome/browser/chromeos/login/user_manager.h" | 78 #include "chrome/browser/chromeos/login/user_manager.h" |
79 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 79 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
80 #include "chrome/browser/lifetime/application_lifetime.h" | 80 #include "chrome/browser/lifetime/application_lifetime.h" |
81 #include "chromeos/chromeos_switches.h" | 81 #include "chromeos/chromeos_switches.h" |
82 #endif | 82 #endif |
83 | 83 |
84 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) | 84 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) |
85 #include "ui/events/x/touch_factory_x11.h" | 85 #include "ui/events/x/touch_factory_x11.h" |
86 #endif | 86 #endif |
87 | 87 |
88 #if defined(OS_WIN) | |
89 #include "chrome/browser/ui/startup/startup_browser_creator_win.h" | |
90 #endif | |
91 | |
92 #if defined(ENABLE_FULL_PRINTING) | 88 #if defined(ENABLE_FULL_PRINTING) |
93 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 89 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
94 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" | 90 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" |
95 #include "chrome/browser/printing/print_dialog_cloud.h" | 91 #include "chrome/browser/printing/print_dialog_cloud.h" |
96 #endif | 92 #endif |
97 | 93 |
98 using content::BrowserThread; | 94 using content::BrowserThread; |
99 using content::ChildProcessSecurityPolicy; | 95 using content::ChildProcessSecurityPolicy; |
100 | 96 |
101 namespace { | 97 namespace { |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 #if defined(OS_CHROMEOS) | 439 #if defined(OS_CHROMEOS) |
444 // In ChromeOS, allow a settings page to be specified on the | 440 // In ChromeOS, allow a settings page to be specified on the |
445 // command line. See ExistingUserController::OnLoginSuccess. | 441 // command line. See ExistingUserController::OnLoginSuccess. |
446 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || | 442 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || |
447 #endif | 443 #endif |
448 (url.spec().compare(content::kAboutBlankURL) == 0)) { | 444 (url.spec().compare(content::kAboutBlankURL) == 0)) { |
449 urls.push_back(url); | 445 urls.push_back(url); |
450 } | 446 } |
451 } | 447 } |
452 } | 448 } |
453 #if defined(OS_WIN) | |
454 if (urls.empty()) { | |
455 // If we are in Windows 8 metro mode and were launched as a result of the | |
456 // search charm or via a url navigation in metro, then fetch the | |
457 // corresponding url. | |
458 GURL url(chrome::GetURLToOpen(profile)); | |
459 if (url.is_valid()) | |
460 urls.push_back(url); | |
461 } | |
462 #endif // OS_WIN | |
463 return urls; | 449 return urls; |
464 } | 450 } |
465 | 451 |
466 // static | 452 // static |
467 bool StartupBrowserCreator::ProcessCmdLineImpl( | 453 bool StartupBrowserCreator::ProcessCmdLineImpl( |
468 const CommandLine& command_line, | 454 const CommandLine& command_line, |
469 const base::FilePath& cur_dir, | 455 const base::FilePath& cur_dir, |
470 bool process_startup, | 456 bool process_startup, |
471 Profile* last_used_profile, | 457 Profile* last_used_profile, |
472 const Profiles& last_opened_profiles, | 458 const Profiles& last_opened_profiles, |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 } | 725 } |
740 | 726 |
741 if (command_line.HasSwitch(switches::kProfileDirectory)) { | 727 if (command_line.HasSwitch(switches::kProfileDirectory)) { |
742 return user_data_dir.Append( | 728 return user_data_dir.Append( |
743 command_line.GetSwitchValuePath(switches::kProfileDirectory)); | 729 command_line.GetSwitchValuePath(switches::kProfileDirectory)); |
744 } | 730 } |
745 | 731 |
746 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 732 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
747 user_data_dir); | 733 user_data_dir); |
748 } | 734 } |
OLD | NEW |