| 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 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #include "chrome/browser/profiles/profile_metrics.h" | 70 #include "chrome/browser/profiles/profile_metrics.h" |
| 71 #include "chrome/browser/profiles/profiles_state.h" | 71 #include "chrome/browser/profiles/profiles_state.h" |
| 72 #include "chrome/browser/repost_form_warning_controller.h" | 72 #include "chrome/browser/repost_form_warning_controller.h" |
| 73 #include "chrome/browser/search/search.h" | 73 #include "chrome/browser/search/search.h" |
| 74 #include "chrome/browser/sessions/session_restore.h" | 74 #include "chrome/browser/sessions/session_restore.h" |
| 75 #include "chrome/browser/sessions/session_service.h" | 75 #include "chrome/browser/sessions/session_service.h" |
| 76 #include "chrome/browser/sessions/session_service_factory.h" | 76 #include "chrome/browser/sessions/session_service_factory.h" |
| 77 #include "chrome/browser/sessions/session_tab_helper.h" | 77 #include "chrome/browser/sessions/session_tab_helper.h" |
| 78 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 78 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 79 #include "chrome/browser/ssl/chrome_security_state_model_client.h" | 79 #include "chrome/browser/ssl/chrome_security_state_model_client.h" |
| 80 #include "chrome/browser/ssl/security_state_model.h" | |
| 81 #include "chrome/browser/sync/profile_sync_service_factory.h" | 80 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 82 #include "chrome/browser/sync/sync_ui_util.h" | 81 #include "chrome/browser/sync/sync_ui_util.h" |
| 83 #include "chrome/browser/tab_contents/retargeting_details.h" | 82 #include "chrome/browser/tab_contents/retargeting_details.h" |
| 84 #include "chrome/browser/tab_contents/tab_util.h" | 83 #include "chrome/browser/tab_contents/tab_util.h" |
| 85 #include "chrome/browser/task_management/web_contents_tags.h" | 84 #include "chrome/browser/task_management/web_contents_tags.h" |
| 86 #include "chrome/browser/themes/theme_service.h" | 85 #include "chrome/browser/themes/theme_service.h" |
| 87 #include "chrome/browser/themes/theme_service_factory.h" | 86 #include "chrome/browser/themes/theme_service_factory.h" |
| 88 #include "chrome/browser/translate/chrome_translate_client.h" | 87 #include "chrome/browser/translate/chrome_translate_client.h" |
| 89 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" | 88 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" |
| 90 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 #include "components/app_modal/javascript_dialog_manager.h" | 159 #include "components/app_modal/javascript_dialog_manager.h" |
| 161 #include "components/bookmarks/browser/bookmark_model.h" | 160 #include "components/bookmarks/browser/bookmark_model.h" |
| 162 #include "components/bookmarks/browser/bookmark_utils.h" | 161 #include "components/bookmarks/browser/bookmark_utils.h" |
| 163 #include "components/bookmarks/common/bookmark_pref_names.h" | 162 #include "components/bookmarks/common/bookmark_pref_names.h" |
| 164 #include "components/browser_sync/browser/profile_sync_service.h" | 163 #include "components/browser_sync/browser/profile_sync_service.h" |
| 165 #include "components/bubble/bubble_controller.h" | 164 #include "components/bubble/bubble_controller.h" |
| 166 #include "components/content_settings/core/browser/host_content_settings_map.h" | 165 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 167 #include "components/favicon/content/content_favicon_driver.h" | 166 #include "components/favicon/content/content_favicon_driver.h" |
| 168 #include "components/history/core/browser/top_sites.h" | 167 #include "components/history/core/browser/top_sites.h" |
| 169 #include "components/search/search.h" | 168 #include "components/search/search.h" |
| 169 #include "components/security_state/security_state_model.h" |
| 170 #include "components/sessions/core/session_types.h" | 170 #include "components/sessions/core/session_types.h" |
| 171 #include "components/sessions/core/tab_restore_service.h" | 171 #include "components/sessions/core/tab_restore_service.h" |
| 172 #include "components/startup_metric_utils/browser/startup_metric_utils.h" | 172 #include "components/startup_metric_utils/browser/startup_metric_utils.h" |
| 173 #include "components/translate/core/browser/language_state.h" | 173 #include "components/translate/core/browser/language_state.h" |
| 174 #include "components/ui/zoom/zoom_controller.h" | 174 #include "components/ui/zoom/zoom_controller.h" |
| 175 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 175 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 176 #include "content/public/browser/devtools_agent_host.h" | 176 #include "content/public/browser/devtools_agent_host.h" |
| 177 #include "content/public/browser/interstitial_page.h" | 177 #include "content/public/browser/interstitial_page.h" |
| 178 #include "content/public/browser/invalidate_type.h" | 178 #include "content/public/browser/invalidate_type.h" |
| 179 #include "content/public/browser/navigation_controller.h" | 179 #include "content/public/browser/navigation_controller.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 using content::NativeWebKeyboardEvent; | 236 using content::NativeWebKeyboardEvent; |
| 237 using content::NavigationController; | 237 using content::NavigationController; |
| 238 using content::NavigationEntry; | 238 using content::NavigationEntry; |
| 239 using content::OpenURLParams; | 239 using content::OpenURLParams; |
| 240 using content::PluginService; | 240 using content::PluginService; |
| 241 using content::Referrer; | 241 using content::Referrer; |
| 242 using content::RenderWidgetHostView; | 242 using content::RenderWidgetHostView; |
| 243 using content::SiteInstance; | 243 using content::SiteInstance; |
| 244 using content::WebContents; | 244 using content::WebContents; |
| 245 using extensions::Extension; | 245 using extensions::Extension; |
| 246 using security_state::SecurityStateModel; |
| 246 using ui::WebDialogDelegate; | 247 using ui::WebDialogDelegate; |
| 247 using web_modal::WebContentsModalDialogManager; | 248 using web_modal::WebContentsModalDialogManager; |
| 248 using blink::WebWindowFeatures; | 249 using blink::WebWindowFeatures; |
| 249 | 250 |
| 250 /////////////////////////////////////////////////////////////////////////////// | 251 /////////////////////////////////////////////////////////////////////////////// |
| 251 | 252 |
| 252 namespace { | 253 namespace { |
| 253 | 254 |
| 254 // How long we wait before updating the browser chrome while loading a page. | 255 // How long we wait before updating the browser chrome while loading a page. |
| 255 const int kUIUpdateCoalescingTimeMS = 200; | 256 const int kUIUpdateCoalescingTimeMS = 200; |
| (...skipping 2482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2738 if (contents && !allow_js_access) { | 2739 if (contents && !allow_js_access) { |
| 2739 contents->web_contents()->GetController().LoadURL( | 2740 contents->web_contents()->GetController().LoadURL( |
| 2740 target_url, | 2741 target_url, |
| 2741 content::Referrer(), | 2742 content::Referrer(), |
| 2742 ui::PAGE_TRANSITION_LINK, | 2743 ui::PAGE_TRANSITION_LINK, |
| 2743 std::string()); // No extra headers. | 2744 std::string()); // No extra headers. |
| 2744 } | 2745 } |
| 2745 | 2746 |
| 2746 return contents != NULL; | 2747 return contents != NULL; |
| 2747 } | 2748 } |
| OLD | NEW |