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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
412 if (process_startup) { | 412 if (process_startup) { |
413 // Check whether the auto-update system needs to be promoted from user | 413 // Check whether the auto-update system needs to be promoted from user |
414 // to system. | 414 // to system. |
415 KeystoneInfoBar::PromotionInfoBar(profile); | 415 KeystoneInfoBar::PromotionInfoBar(profile); |
416 } | 416 } |
417 #endif | 417 #endif |
418 } | 418 } |
419 | 419 |
420 #if defined(OS_WIN) | 420 #if defined(OS_WIN) |
421 if (process_startup) | 421 if (process_startup) |
422 ShellIntegration::MigrateChromiumShortcuts(); | 422 ShellIntegration::MigrateShortcuts(); |
423 #endif // defined(OS_WIN) | 423 #endif // defined(OS_WIN) |
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)) { |
431 int width, height; | 431 int width, height; |
432 width = height = 0; | 432 width = height = 0; |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
980 } | 980 } |
981 | 981 |
982 #if !defined(OS_WIN) || defined(USE_AURA) | 982 #if !defined(OS_WIN) || defined(USE_AURA) |
983 // static | 983 // static |
984 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 984 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
985 Profile* profile, | 985 Profile* profile, |
986 const std::vector<GURL>& startup_urls) { | 986 const std::vector<GURL>& startup_urls) { |
987 return false; | 987 return false; |
988 } | 988 } |
989 #endif | 989 #endif |
OLD | NEW |