| 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/constants.h" | 177 #include "extensions/common/constants.h" |
| 178 #include "grit/chromium_strings.h" | 178 #include "grit/chromium_strings.h" |
| 179 #include "grit/generated_resources.h" | 179 #include "grit/generated_resources.h" |
| 180 #include "grit/locale_settings.h" | 180 #include "grit/locale_settings.h" |
| 181 #include "grit/theme_resources.h" | 181 #include "grit/theme_resources.h" |
| 182 #include "net/base/net_util.h" | 182 #include "net/base/net_util.h" |
| 183 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 183 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 184 #include "net/cookies/cookie_monster.h" | 184 #include "net/cookies/cookie_monster.h" |
| 185 #include "net/url_request/url_request_context.h" | 185 #include "net/url_request/url_request_context.h" |
| 186 #include "ui/base/l10n/l10n_util.h" | 186 #include "ui/base/l10n/l10n_util.h" |
| 187 #include "ui/base/window_open_disposition.h" |
| 187 #include "ui/gfx/point.h" | 188 #include "ui/gfx/point.h" |
| 188 #include "ui/shell_dialogs/selected_file_info.h" | 189 #include "ui/shell_dialogs/selected_file_info.h" |
| 189 #include "webkit/glue/web_intent_data.h" | 190 #include "webkit/glue/web_intent_data.h" |
| 190 #include "webkit/glue/web_intent_service_data.h" | 191 #include "webkit/glue/web_intent_service_data.h" |
| 191 #include "webkit/glue/webkit_glue.h" | 192 #include "webkit/glue/webkit_glue.h" |
| 192 #include "webkit/glue/window_open_disposition.h" | |
| 193 #include "webkit/plugins/webplugininfo.h" | 193 #include "webkit/plugins/webplugininfo.h" |
| 194 | 194 |
| 195 #if defined(OS_WIN) | 195 #if defined(OS_WIN) |
| 196 #include "base/win/metro.h" | 196 #include "base/win/metro.h" |
| 197 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" | 197 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" |
| 198 #include "chrome/browser/shell_integration.h" | 198 #include "chrome/browser/shell_integration.h" |
| 199 #include "chrome/browser/ssl/ssl_error_info.h" | 199 #include "chrome/browser/ssl/ssl_error_info.h" |
| 200 #include "chrome/browser/task_manager/task_manager.h" | 200 #include "chrome/browser/task_manager/task_manager.h" |
| 201 #include "chrome/browser/ui/view_ids.h" | 201 #include "chrome/browser/ui/view_ids.h" |
| 202 #include "ui/base/win/shell.h" | 202 #include "ui/base/win/shell.h" |
| (...skipping 2137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2340 if (contents && !allow_js_access) { | 2340 if (contents && !allow_js_access) { |
| 2341 contents->web_contents()->GetController().LoadURL( | 2341 contents->web_contents()->GetController().LoadURL( |
| 2342 target_url, | 2342 target_url, |
| 2343 content::Referrer(), | 2343 content::Referrer(), |
| 2344 content::PAGE_TRANSITION_LINK, | 2344 content::PAGE_TRANSITION_LINK, |
| 2345 std::string()); // No extra headers. | 2345 std::string()); // No extra headers. |
| 2346 } | 2346 } |
| 2347 | 2347 |
| 2348 return contents != NULL; | 2348 return contents != NULL; |
| 2349 } | 2349 } |
| OLD | NEW |