OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
177 #include "extensions/common/extension.h" | 177 #include "extensions/common/extension.h" |
178 #include "extensions/common/manifest_handlers/background_info.h" | 178 #include "extensions/common/manifest_handlers/background_info.h" |
179 #include "grit/chromium_strings.h" | 179 #include "grit/chromium_strings.h" |
180 #include "grit/generated_resources.h" | 180 #include "grit/generated_resources.h" |
181 #include "grit/locale_settings.h" | 181 #include "grit/locale_settings.h" |
182 #include "grit/theme_resources.h" | 182 #include "grit/theme_resources.h" |
183 #include "net/base/net_util.h" | 183 #include "net/base/net_util.h" |
184 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 184 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
185 #include "net/cookies/cookie_monster.h" | 185 #include "net/cookies/cookie_monster.h" |
186 #include "net/url_request/url_request_context.h" | 186 #include "net/url_request/url_request_context.h" |
187 #include "third_party/WebKit/public/web/WebInputEvent.h" | |
jam
2014/01/23 01:34:47
this isn't needed?
| |
187 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 188 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
188 #include "ui/base/l10n/l10n_util.h" | 189 #include "ui/base/l10n/l10n_util.h" |
189 #include "ui/base/window_open_disposition.h" | 190 #include "ui/base/window_open_disposition.h" |
190 #include "ui/gfx/point.h" | 191 #include "ui/gfx/point.h" |
191 #include "ui/shell_dialogs/selected_file_info.h" | 192 #include "ui/shell_dialogs/selected_file_info.h" |
192 | 193 |
193 #if defined(OS_WIN) | 194 #if defined(OS_WIN) |
194 #include "base/win/metro.h" | 195 #include "base/win/metro.h" |
195 #include "chrome/browser/ssl/ssl_error_info.h" | 196 #include "chrome/browser/ssl/ssl_error_info.h" |
196 #include "chrome/browser/task_manager/task_manager.h" | 197 #include "chrome/browser/task_manager/task_manager.h" |
(...skipping 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2292 if (contents && !allow_js_access) { | 2293 if (contents && !allow_js_access) { |
2293 contents->web_contents()->GetController().LoadURL( | 2294 contents->web_contents()->GetController().LoadURL( |
2294 target_url, | 2295 target_url, |
2295 content::Referrer(), | 2296 content::Referrer(), |
2296 content::PAGE_TRANSITION_LINK, | 2297 content::PAGE_TRANSITION_LINK, |
2297 std::string()); // No extra headers. | 2298 std::string()); // No extra headers. |
2298 } | 2299 } |
2299 | 2300 |
2300 return contents != NULL; | 2301 return contents != NULL; |
2301 } | 2302 } |
OLD | NEW |