| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 #include "extensions/common/constants.h" | 94 #include "extensions/common/constants.h" |
| 95 #include "grit/locale_settings.h" | 95 #include "grit/locale_settings.h" |
| 96 #include "ui/base/l10n/l10n_util.h" | 96 #include "ui/base/l10n/l10n_util.h" |
| 97 #include "ui/base/resource/resource_bundle.h" | 97 #include "ui/base/resource/resource_bundle.h" |
| 98 | 98 |
| 99 #if defined(OS_MACOSX) | 99 #if defined(OS_MACOSX) |
| 100 #include "base/mac/mac_util.h" | 100 #include "base/mac/mac_util.h" |
| 101 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" | 101 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" |
| 102 #endif | 102 #endif |
| 103 | 103 |
| 104 #if defined(TOOLKIT_GTK) | |
| 105 #include "chrome/browser/ui/gtk/gtk_util.h" | |
| 106 #endif | |
| 107 | |
| 108 #if defined(OS_WIN) | 104 #if defined(OS_WIN) |
| 109 #include "base/win/windows_version.h" | 105 #include "base/win/windows_version.h" |
| 110 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 106 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 111 #endif | 107 #endif |
| 112 | 108 |
| 113 using content::ChildProcessSecurityPolicy; | 109 using content::ChildProcessSecurityPolicy; |
| 114 using content::WebContents; | 110 using content::WebContents; |
| 115 using extensions::Extension; | 111 using extensions::Extension; |
| 116 | 112 |
| 117 namespace { | 113 namespace { |
| (...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 } | 947 } |
| 952 | 948 |
| 953 #if !defined(OS_WIN) | 949 #if !defined(OS_WIN) |
| 954 // static | 950 // static |
| 955 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 951 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| 956 Profile* profile, | 952 Profile* profile, |
| 957 const std::vector<GURL>& startup_urls) { | 953 const std::vector<GURL>& startup_urls) { |
| 958 return false; | 954 return false; |
| 959 } | 955 } |
| 960 #endif | 956 #endif |
| OLD | NEW |