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