| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 70 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 72 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 72 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
| 74 #include "chrome/common/chrome_constants.h" | 74 #include "chrome/common/chrome_constants.h" |
| 75 #include "chrome/common/chrome_paths.h" | 75 #include "chrome/common/chrome_paths.h" |
| 76 #include "chrome/common/chrome_result_codes.h" | 76 #include "chrome/common/chrome_result_codes.h" |
| 77 #include "chrome/common/chrome_switches.h" | 77 #include "chrome/common/chrome_switches.h" |
| 78 #include "chrome/common/chrome_version_info.h" | 78 #include "chrome/common/chrome_version_info.h" |
| 79 #include "chrome/common/extensions/extension_constants.h" | 79 #include "chrome/common/extensions/extension_constants.h" |
| 80 #include "chrome/common/pref_names.h" | |
| 81 #include "chrome/common/url_constants.h" | 80 #include "chrome/common/url_constants.h" |
| 82 #include "chrome/grit/locale_settings.h" | 81 #include "chrome/grit/locale_settings.h" |
| 83 #include "chrome/installer/util/browser_distribution.h" | 82 #include "chrome/installer/util/browser_distribution.h" |
| 84 #include "components/google/core/browser/google_util.h" | 83 #include "components/google/core/browser/google_util.h" |
| 85 #include "content/public/browser/child_process_security_policy.h" | 84 #include "content/public/browser/child_process_security_policy.h" |
| 86 #include "content/public/browser/dom_storage_context.h" | 85 #include "content/public/browser/dom_storage_context.h" |
| 87 #include "content/public/browser/notification_observer.h" | 86 #include "content/public/browser/notification_observer.h" |
| 88 #include "content/public/browser/notification_registrar.h" | 87 #include "content/public/browser/notification_registrar.h" |
| 89 #include "content/public/browser/storage_partition.h" | 88 #include "content/public/browser/storage_partition.h" |
| 90 #include "content/public/browser/web_contents.h" | 89 #include "content/public/browser/web_contents.h" |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 // behavior is desired because completing or skipping the sync promo | 906 // behavior is desired because completing or skipping the sync promo |
| 908 // causes a redirect to the NTP. | 907 // causes a redirect to the NTP. |
| 909 if (!startup_urls->empty() && | 908 if (!startup_urls->empty() && |
| 910 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) | 909 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) |
| 911 startup_urls->at(0) = sync_promo_url; | 910 startup_urls->at(0) = sync_promo_url; |
| 912 else | 911 else |
| 913 startup_urls->insert(startup_urls->begin(), sync_promo_url); | 912 startup_urls->insert(startup_urls->begin(), sync_promo_url); |
| 914 } | 913 } |
| 915 } | 914 } |
| 916 } | 915 } |
| OLD | NEW |