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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 } | 410 } |
411 | 411 |
412 #if defined(OS_WIN) | 412 #if defined(OS_WIN) |
413 if (process_startup) | 413 if (process_startup) |
414 ShellIntegration::MigrateChromiumShortcuts(); | 414 ShellIntegration::MigrateChromiumShortcuts(); |
415 #endif // defined(OS_WIN) | 415 #endif // defined(OS_WIN) |
416 | 416 |
417 #if defined(ENABLE_EXTENSIONS) | 417 #if defined(ENABLE_EXTENSIONS) |
418 // If we deferred creation of background extension hosts, we want to create | 418 // If we deferred creation of background extension hosts, we want to create |
419 // them now that the session (if any) has been restored. | 419 // them now that the session (if any) has been restored. |
420 ExtensionProcessManager* process_manager = | 420 extensions::ProcessManager* process_manager = |
421 extensions::ExtensionSystem::Get(profile)->process_manager(); | 421 extensions::ExtensionSystem::Get(profile)->process_manager(); |
422 process_manager->DeferBackgroundHostCreation(false); | 422 process_manager->DeferBackgroundHostCreation(false); |
423 #endif | 423 #endif |
424 | 424 |
425 return true; | 425 return true; |
426 } | 426 } |
427 | 427 |
428 void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize( | 428 void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize( |
429 gfx::Rect* bounds) { | 429 gfx::Rect* bounds) { |
430 if (command_line_.HasSwitch(switches::kAppWindowSize)) { | 430 if (command_line_.HasSwitch(switches::kAppWindowSize)) { |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
986 } | 986 } |
987 | 987 |
988 #if !defined(OS_WIN) | 988 #if !defined(OS_WIN) |
989 // static | 989 // static |
990 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 990 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
991 Profile* profile, | 991 Profile* profile, |
992 const std::vector<GURL>& startup_urls) { | 992 const std::vector<GURL>& startup_urls) { |
993 return false; | 993 return false; |
994 } | 994 } |
995 #endif | 995 #endif |
OLD | NEW |