OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 #include "chrome/browser/ui/views/avatar_menu_button.h" | 52 #include "chrome/browser/ui/views/avatar_menu_button.h" |
53 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 53 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
54 #include "chrome/browser/ui/views/browser_dialogs.h" | 54 #include "chrome/browser/ui/views/browser_dialogs.h" |
55 #include "chrome/browser/ui/views/default_search_view.h" | 55 #include "chrome/browser/ui/views/default_search_view.h" |
56 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 56 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
57 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 57 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
58 #include "chrome/browser/ui/views/frame/contents_container.h" | 58 #include "chrome/browser/ui/views/frame/contents_container.h" |
59 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" | 59 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" |
60 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 60 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
61 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 61 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
62 #include "chrome/browser/ui/views/page_info_window.h" | |
63 #include "chrome/browser/ui/views/status_bubble_views.h" | 62 #include "chrome/browser/ui/views/status_bubble_views.h" |
64 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 63 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
65 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" | 64 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
66 #include "chrome/browser/ui/views/tabs/tab_strip_factory.h" | 65 #include "chrome/browser/ui/views/tabs/tab_strip_factory.h" |
67 #include "chrome/browser/ui/views/toolbar_view.h" | 66 #include "chrome/browser/ui/views/toolbar_view.h" |
68 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 67 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
69 #include "chrome/browser/ui/views/window.h" | 68 #include "chrome/browser/ui/views/window.h" |
70 #include "chrome/browser/ui/webui/bug_report_ui.h" | 69 #include "chrome/browser/ui/webui/bug_report_ui.h" |
71 #include "chrome/browser/ui/webui/task_manager_dialog.h" | 70 #include "chrome/browser/ui/webui/task_manager_dialog.h" |
72 #include "chrome/browser/ui/window_sizer.h" | 71 #include "chrome/browser/ui/window_sizer.h" |
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1131 } | 1130 } |
1132 | 1131 |
1133 void BrowserView::TabContentsFocused(TabContents* tab_contents) { | 1132 void BrowserView::TabContentsFocused(TabContents* tab_contents) { |
1134 contents_container_->TabContentsFocused(tab_contents); | 1133 contents_container_->TabContentsFocused(tab_contents); |
1135 } | 1134 } |
1136 | 1135 |
1137 void BrowserView::ShowPageInfo(Profile* profile, | 1136 void BrowserView::ShowPageInfo(Profile* profile, |
1138 const GURL& url, | 1137 const GURL& url, |
1139 const NavigationEntry::SSLStatus& ssl, | 1138 const NavigationEntry::SSLStatus& ssl, |
1140 bool show_history) { | 1139 bool show_history) { |
1141 browser::ShowPageInfoBubble(this, profile, url, ssl, show_history); | 1140 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), |
alicet1
2011/11/15 02:02:13
would it be better that you expose a non-const ver
msw
2011/11/15 20:16:57
Done.
| |
1141 profile, url, ssl, show_history); | |
1142 } | 1142 } |
1143 | 1143 |
1144 void BrowserView::ShowAppMenu() { | 1144 void BrowserView::ShowAppMenu() { |
1145 toolbar_->app_menu()->Activate(); | 1145 toolbar_->app_menu()->Activate(); |
1146 } | 1146 } |
1147 | 1147 |
1148 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1148 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
1149 bool* is_keyboard_shortcut) { | 1149 bool* is_keyboard_shortcut) { |
1150 if (event.type != WebKit::WebInputEvent::RawKeyDown) | 1150 if (event.type != WebKit::WebInputEvent::RawKeyDown) |
1151 return false; | 1151 return false; |
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2595 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, | 2595 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, |
2596 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, | 2596 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, |
2597 bubble_view, bubble_view); | 2597 bubble_view, bubble_view); |
2598 } | 2598 } |
2599 | 2599 |
2600 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2600 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2601 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2601 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2602 if (button) | 2602 if (button) |
2603 button->ShowAvatarBubble(); | 2603 button->ShowAvatarBubble(); |
2604 } | 2604 } |
OLD | NEW |