| 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/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 // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "base/path_service.h" | 21 #include "base/path_service.h" |
| 22 #include "base/process_info.h" | 22 #include "base/process_info.h" |
| 23 #include "base/string_number_conversions.h" | 23 #include "base/string_number_conversions.h" |
| 24 #include "base/string_util.h" | 24 #include "base/string_util.h" |
| 25 #include "base/stringprintf.h" | 25 #include "base/stringprintf.h" |
| 26 #include "base/threading/thread.h" | 26 #include "base/threading/thread.h" |
| 27 #include "base/threading/thread_restrictions.h" | 27 #include "base/threading/thread_restrictions.h" |
| 28 #include "base/time.h" | 28 #include "base/time.h" |
| 29 #include "base/utf_string_conversions.h" | 29 #include "base/utf_string_conversions.h" |
| 30 #include "chrome/app/chrome_command_ids.h" | 30 #include "chrome/app/chrome_command_ids.h" |
| 31 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" |
| 31 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 32 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| 32 #include "chrome/browser/background/background_contents_service.h" | 33 #include "chrome/browser/background/background_contents_service.h" |
| 33 #include "chrome/browser/background/background_contents_service_factory.h" | 34 #include "chrome/browser/background/background_contents_service_factory.h" |
| 34 #include "chrome/browser/bookmarks/bookmark_model.h" | 35 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 35 #include "chrome/browser/bookmarks/bookmark_utils.h" | 36 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 36 #include "chrome/browser/browser_process.h" | 37 #include "chrome/browser/browser_process.h" |
| 37 #include "chrome/browser/browser_shutdown.h" | 38 #include "chrome/browser/browser_shutdown.h" |
| 38 #include "chrome/browser/character_encoding.h" | 39 #include "chrome/browser/character_encoding.h" |
| 39 #include "chrome/browser/chrome_page_zoom.h" | 40 #include "chrome/browser/chrome_page_zoom.h" |
| 40 #include "chrome/browser/content_settings/host_content_settings_map.h" | 41 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 #include "chrome/browser/sessions/session_service.h" | 82 #include "chrome/browser/sessions/session_service.h" |
| 82 #include "chrome/browser/sessions/session_service_factory.h" | 83 #include "chrome/browser/sessions/session_service_factory.h" |
| 83 #include "chrome/browser/sessions/session_types.h" | 84 #include "chrome/browser/sessions/session_types.h" |
| 84 #include "chrome/browser/sessions/tab_restore_service.h" | 85 #include "chrome/browser/sessions/tab_restore_service.h" |
| 85 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 86 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 86 #include "chrome/browser/sync/profile_sync_service.h" | 87 #include "chrome/browser/sync/profile_sync_service.h" |
| 87 #include "chrome/browser/sync/profile_sync_service_factory.h" | 88 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 88 #include "chrome/browser/sync/sync_ui_util.h" | 89 #include "chrome/browser/sync/sync_ui_util.h" |
| 89 #include "chrome/browser/tab_contents/background_contents.h" | 90 #include "chrome/browser/tab_contents/background_contents.h" |
| 90 #include "chrome/browser/tab_contents/retargeting_details.h" | 91 #include "chrome/browser/tab_contents/retargeting_details.h" |
| 91 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" | |
| 92 #include "chrome/browser/tab_contents/tab_util.h" | 92 #include "chrome/browser/tab_contents/tab_util.h" |
| 93 #include "chrome/browser/themes/theme_service.h" | 93 #include "chrome/browser/themes/theme_service.h" |
| 94 #include "chrome/browser/themes/theme_service_factory.h" | 94 #include "chrome/browser/themes/theme_service_factory.h" |
| 95 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" | 95 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" |
| 96 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 96 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
| 97 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 97 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
| 98 #include "chrome/browser/ui/browser_command_controller.h" | 98 #include "chrome/browser/ui/browser_command_controller.h" |
| 99 #include "chrome/browser/ui/browser_commands.h" | 99 #include "chrome/browser/ui/browser_commands.h" |
| 100 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" | 100 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" |
| 101 #include "chrome/browser/ui/browser_dialogs.h" | 101 #include "chrome/browser/ui/browser_dialogs.h" |
| (...skipping 2217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2319 if (contents && !allow_js_access) { | 2319 if (contents && !allow_js_access) { |
| 2320 contents->web_contents()->GetController().LoadURL( | 2320 contents->web_contents()->GetController().LoadURL( |
| 2321 target_url, | 2321 target_url, |
| 2322 content::Referrer(), | 2322 content::Referrer(), |
| 2323 content::PAGE_TRANSITION_LINK, | 2323 content::PAGE_TRANSITION_LINK, |
| 2324 std::string()); // No extra headers. | 2324 std::string()); // No extra headers. |
| 2325 } | 2325 } |
| 2326 | 2326 |
| 2327 return contents != NULL; | 2327 return contents != NULL; |
| 2328 } | 2328 } |
| OLD | NEW |