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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 115 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
116 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" | 116 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" |
117 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" | 117 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" |
118 #include "chrome/browser/ui/fast_unload_controller.h" | 118 #include "chrome/browser/ui/fast_unload_controller.h" |
119 #include "chrome/browser/ui/find_bar/find_bar.h" | 119 #include "chrome/browser/ui/find_bar/find_bar.h" |
120 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 120 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
121 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 121 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
122 #include "chrome/browser/ui/global_error/global_error.h" | 122 #include "chrome/browser/ui/global_error/global_error.h" |
123 #include "chrome/browser/ui/global_error/global_error_service.h" | 123 #include "chrome/browser/ui/global_error/global_error_service.h" |
124 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 124 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 125 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h" |
125 #include "chrome/browser/ui/location_bar/location_bar.h" | 126 #include "chrome/browser/ui/location_bar/location_bar.h" |
126 #include "chrome/browser/ui/media_utils.h" | 127 #include "chrome/browser/ui/media_utils.h" |
127 #include "chrome/browser/ui/search/search_delegate.h" | 128 #include "chrome/browser/ui/search/search_delegate.h" |
128 #include "chrome/browser/ui/search/search_model.h" | 129 #include "chrome/browser/ui/search/search_model.h" |
129 #include "chrome/browser/ui/search/search_tab_helper.h" | 130 #include "chrome/browser/ui/search/search_tab_helper.h" |
130 #include "chrome/browser/ui/settings_window_manager.h" | 131 #include "chrome/browser/ui/settings_window_manager.h" |
131 #include "chrome/browser/ui/singleton_tabs.h" | 132 #include "chrome/browser/ui/singleton_tabs.h" |
132 #include "chrome/browser/ui/status_bubble.h" | 133 #include "chrome/browser/ui/status_bubble.h" |
133 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" | 134 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" |
134 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" | 135 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
(...skipping 14 matching lines...) Expand all Loading... |
149 #include "chrome/common/chrome_constants.h" | 150 #include "chrome/common/chrome_constants.h" |
150 #include "chrome/common/chrome_switches.h" | 151 #include "chrome/common/chrome_switches.h" |
151 #include "chrome/common/custom_handlers/protocol_handler.h" | 152 #include "chrome/common/custom_handlers/protocol_handler.h" |
152 #include "chrome/common/pref_names.h" | 153 #include "chrome/common/pref_names.h" |
153 #include "chrome/common/profiling.h" | 154 #include "chrome/common/profiling.h" |
154 #include "chrome/common/search/search_types.h" | 155 #include "chrome/common/search/search_types.h" |
155 #include "chrome/common/url_constants.h" | 156 #include "chrome/common/url_constants.h" |
156 #include "chrome/grit/chromium_strings.h" | 157 #include "chrome/grit/chromium_strings.h" |
157 #include "chrome/grit/generated_resources.h" | 158 #include "chrome/grit/generated_resources.h" |
158 #include "chrome/grit/locale_settings.h" | 159 #include "chrome/grit/locale_settings.h" |
159 #include "components/app_modal/javascript_dialog_manager.h" | |
160 #include "components/bookmarks/browser/bookmark_model.h" | 160 #include "components/bookmarks/browser/bookmark_model.h" |
161 #include "components/bookmarks/browser/bookmark_utils.h" | 161 #include "components/bookmarks/browser/bookmark_utils.h" |
162 #include "components/bookmarks/common/bookmark_pref_names.h" | 162 #include "components/bookmarks/common/bookmark_pref_names.h" |
163 #include "components/browser_sync/browser/profile_sync_service.h" | 163 #include "components/browser_sync/browser/profile_sync_service.h" |
164 #include "components/bubble/bubble_controller.h" | 164 #include "components/bubble/bubble_controller.h" |
165 #include "components/content_settings/core/browser/host_content_settings_map.h" | 165 #include "components/content_settings/core/browser/host_content_settings_map.h" |
166 #include "components/favicon/content/content_favicon_driver.h" | 166 #include "components/favicon/content/content_favicon_driver.h" |
167 #include "components/history/core/browser/top_sites.h" | 167 #include "components/history/core/browser/top_sites.h" |
168 #include "components/prefs/pref_service.h" | 168 #include "components/prefs/pref_service.h" |
169 #include "components/search/search.h" | 169 #include "components/search/search.h" |
(...skipping 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1632 TabDialogs::FromWebContents(source)->HideHungRendererDialog(); | 1632 TabDialogs::FromWebContents(source)->HideHungRendererDialog(); |
1633 } | 1633 } |
1634 | 1634 |
1635 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { | 1635 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { |
1636 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1636 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1637 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1637 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1638 } | 1638 } |
1639 | 1639 |
1640 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( | 1640 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( |
1641 WebContents* source) { | 1641 WebContents* source) { |
1642 return app_modal::JavaScriptDialogManager::GetInstance(); | 1642 return JavaScriptDialogTabHelper::FromWebContents(source); |
1643 } | 1643 } |
1644 | 1644 |
1645 content::ColorChooser* Browser::OpenColorChooser( | 1645 content::ColorChooser* Browser::OpenColorChooser( |
1646 WebContents* web_contents, | 1646 WebContents* web_contents, |
1647 SkColor initial_color, | 1647 SkColor initial_color, |
1648 const std::vector<content::ColorSuggestion>& suggestions) { | 1648 const std::vector<content::ColorSuggestion>& suggestions) { |
1649 return chrome::ShowColorChooser(web_contents, initial_color); | 1649 return chrome::ShowColorChooser(web_contents, initial_color); |
1650 } | 1650 } |
1651 | 1651 |
1652 void Browser::RunFileChooser(content::RenderFrameHost* render_frame_host, | 1652 void Browser::RunFileChooser(content::RenderFrameHost* render_frame_host, |
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2564 if (contents && !allow_js_access) { | 2564 if (contents && !allow_js_access) { |
2565 contents->web_contents()->GetController().LoadURL( | 2565 contents->web_contents()->GetController().LoadURL( |
2566 target_url, | 2566 target_url, |
2567 content::Referrer(), | 2567 content::Referrer(), |
2568 ui::PAGE_TRANSITION_LINK, | 2568 ui::PAGE_TRANSITION_LINK, |
2569 std::string()); // No extra headers. | 2569 std::string()); // No extra headers. |
2570 } | 2570 } |
2571 | 2571 |
2572 return contents != NULL; | 2572 return contents != NULL; |
2573 } | 2573 } |
OLD | NEW |