| 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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "chrome/browser/ui/views/frame/contents_container.h" | 52 #include "chrome/browser/ui/views/frame/contents_container.h" |
| 53 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" | 53 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" |
| 54 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 54 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
| 55 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 55 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
| 56 #include "chrome/browser/ui/views/password_generation_bubble_view.h" | 56 #include "chrome/browser/ui/views/password_generation_bubble_view.h" |
| 57 #include "chrome/browser/ui/views/status_bubble_views.h" | 57 #include "chrome/browser/ui/views/status_bubble_views.h" |
| 58 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" | 58 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
| 59 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 59 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 60 #include "chrome/browser/ui/views/toolbar_view.h" | 60 #include "chrome/browser/ui/views/toolbar_view.h" |
| 61 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 61 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
| 62 #include "chrome/browser/ui/views/website_settings_popup_view.h" |
| 62 #include "chrome/browser/ui/webui/feedback_ui.h" | 63 #include "chrome/browser/ui/webui/feedback_ui.h" |
| 63 #include "chrome/browser/ui/window_sizer.h" | 64 #include "chrome/browser/ui/window_sizer.h" |
| 64 #include "chrome/common/chrome_notification_types.h" | 65 #include "chrome/common/chrome_notification_types.h" |
| 65 #include "chrome/common/chrome_switches.h" | 66 #include "chrome/common/chrome_switches.h" |
| 66 #include "chrome/common/extensions/extension_resource.h" | 67 #include "chrome/common/extensions/extension_resource.h" |
| 67 #include "chrome/common/pref_names.h" | 68 #include "chrome/common/pref_names.h" |
| 68 #include "chrome/common/url_constants.h" | 69 #include "chrome/common/url_constants.h" |
| 69 #include "content/public/browser/download_manager.h" | 70 #include "content/public/browser/download_manager.h" |
| 70 #include "content/public/browser/native_web_keyboard_event.h" | 71 #include "content/public/browser/native_web_keyboard_event.h" |
| 71 #include "content/public/browser/notification_service.h" | 72 #include "content/public/browser/notification_service.h" |
| (...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1141 bool show_history) { | 1142 bool show_history) { |
| 1142 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), | 1143 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), |
| 1143 profile, url, ssl, show_history, browser_.get()); | 1144 profile, url, ssl, show_history, browser_.get()); |
| 1144 } | 1145 } |
| 1145 | 1146 |
| 1146 void BrowserView::ShowWebsiteSettings(Profile* profile, | 1147 void BrowserView::ShowWebsiteSettings(Profile* profile, |
| 1147 TabContentsWrapper* tab_contents_wrapper, | 1148 TabContentsWrapper* tab_contents_wrapper, |
| 1148 const GURL& url, | 1149 const GURL& url, |
| 1149 const content::SSLStatus& ssl, | 1150 const content::SSLStatus& ssl, |
| 1150 bool show_history) { | 1151 bool show_history) { |
| 1152 WebsiteSettingsPopupView::ShowPopup( |
| 1153 GetLocationBarView()->location_icon_view(), profile, |
| 1154 tab_contents_wrapper, url, ssl); |
| 1151 } | 1155 } |
| 1152 | 1156 |
| 1153 void BrowserView::ShowAppMenu() { | 1157 void BrowserView::ShowAppMenu() { |
| 1154 toolbar_->app_menu()->Activate(); | 1158 toolbar_->app_menu()->Activate(); |
| 1155 } | 1159 } |
| 1156 | 1160 |
| 1157 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1161 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
| 1158 bool* is_keyboard_shortcut) { | 1162 bool* is_keyboard_shortcut) { |
| 1159 *is_keyboard_shortcut = false; | 1163 *is_keyboard_shortcut = false; |
| 1160 | 1164 |
| (...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2429 this, | 2433 this, |
| 2430 web_contents->GetRenderViewHost(), | 2434 web_contents->GetRenderViewHost(), |
| 2431 password_generator, | 2435 password_generator, |
| 2432 browser_.get(), | 2436 browser_.get(), |
| 2433 wrapper->password_manager()); | 2437 wrapper->password_manager()); |
| 2434 | 2438 |
| 2435 views::BubbleDelegateView::CreateBubble(bubble); | 2439 views::BubbleDelegateView::CreateBubble(bubble); |
| 2436 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2440 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2437 bubble->Show(); | 2441 bubble->Show(); |
| 2438 } | 2442 } |
| OLD | NEW |