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 "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
79 #include "chrome/common/url_constants.h" | 79 #include "chrome/common/url_constants.h" |
80 #include "chrome/installer/util/browser_distribution.h" | 80 #include "chrome/installer/util/browser_distribution.h" |
81 #include "content/public/browser/child_process_security_policy.h" | 81 #include "content/public/browser/child_process_security_policy.h" |
82 #include "content/public/browser/dom_storage_context.h" | 82 #include "content/public/browser/dom_storage_context.h" |
83 #include "content/public/browser/notification_observer.h" | 83 #include "content/public/browser/notification_observer.h" |
84 #include "content/public/browser/notification_registrar.h" | 84 #include "content/public/browser/notification_registrar.h" |
85 #include "content/public/browser/storage_partition.h" | 85 #include "content/public/browser/storage_partition.h" |
86 #include "content/public/browser/web_contents.h" | 86 #include "content/public/browser/web_contents.h" |
87 #include "content/public/browser/web_contents_view.h" | 87 #include "content/public/browser/web_contents_view.h" |
88 #include "grit/locale_settings.h" | 88 #include "grit/locale_settings.h" |
89 #include "grit/theme_resources.h" | |
Pete Williamson
2013/01/16 19:43:20
This seems a bit odd, why add a new .h file if the
dewittj
2013/01/16 22:30:40
This was a bug.
| |
89 #include "ui/base/l10n/l10n_util.h" | 90 #include "ui/base/l10n/l10n_util.h" |
90 #include "ui/base/resource/resource_bundle.h" | 91 #include "ui/base/resource/resource_bundle.h" |
91 #include "ui/gfx/rect.h" | 92 #include "ui/gfx/rect.h" |
92 #include "ui/gfx/screen.h" | 93 #include "ui/gfx/screen.h" |
93 | 94 |
94 #if defined(OS_MACOSX) | 95 #if defined(OS_MACOSX) |
95 #include "base/mac/mac_util.h" | 96 #include "base/mac/mac_util.h" |
96 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" | 97 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" |
97 #endif | 98 #endif |
98 | 99 |
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
956 } | 957 } |
957 | 958 |
958 #if !defined(OS_WIN) || defined(USE_AURA) | 959 #if !defined(OS_WIN) || defined(USE_AURA) |
959 // static | 960 // static |
960 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 961 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
961 Profile* profile, | 962 Profile* profile, |
962 const std::vector<GURL>& startup_urls) { | 963 const std::vector<GURL>& startup_urls) { |
963 return false; | 964 return false; |
964 } | 965 } |
965 #endif | 966 #endif |
OLD | NEW |