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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 #include "content/public/browser/notification_registrar.h" | 86 #include "content/public/browser/notification_registrar.h" |
87 #include "content/public/browser/storage_partition.h" | 87 #include "content/public/browser/storage_partition.h" |
88 #include "content/public/browser/web_contents.h" | 88 #include "content/public/browser/web_contents.h" |
89 #include "extensions/browser/extension_prefs.h" | 89 #include "extensions/browser/extension_prefs.h" |
90 #include "extensions/browser/extension_registry.h" | 90 #include "extensions/browser/extension_registry.h" |
91 #include "extensions/common/constants.h" | 91 #include "extensions/common/constants.h" |
92 #include "extensions/common/extension.h" | 92 #include "extensions/common/extension.h" |
93 #include "extensions/common/extension_set.h" | 93 #include "extensions/common/extension_set.h" |
94 #include "grit/locale_settings.h" | 94 #include "grit/locale_settings.h" |
95 #include "ui/base/l10n/l10n_util.h" | 95 #include "ui/base/l10n/l10n_util.h" |
96 #include "ui/base/resource/resource_bundle.h" | |
97 | 96 |
98 #if defined(OS_MACOSX) | 97 #if defined(OS_MACOSX) |
99 #include "base/mac/mac_util.h" | 98 #include "base/mac/mac_util.h" |
100 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" | 99 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" |
101 #endif | 100 #endif |
102 | 101 |
103 #if defined(OS_WIN) | 102 #if defined(OS_WIN) |
104 #include "base/win/windows_version.h" | 103 #include "base/win/windows_version.h" |
105 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 104 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
106 #endif | 105 #endif |
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
915 // behavior is desired because completing or skipping the sync promo | 914 // behavior is desired because completing or skipping the sync promo |
916 // causes a redirect to the NTP. | 915 // causes a redirect to the NTP. |
917 if (!startup_urls->empty() && | 916 if (!startup_urls->empty() && |
918 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) | 917 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) |
919 startup_urls->at(0) = sync_promo_url; | 918 startup_urls->at(0) = sync_promo_url; |
920 else | 919 else |
921 startup_urls->insert(startup_urls->begin(), sync_promo_url); | 920 startup_urls->insert(startup_urls->begin(), sync_promo_url); |
922 } | 921 } |
923 } | 922 } |
924 } | 923 } |
OLD | NEW |