Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 8508048: Rebase PageInfoBubble on the new views bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge, indent a line. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 } 1134 }
1136 1135
1137 void BrowserView::TabContentsFocused(TabContents* tab_contents) { 1136 void BrowserView::TabContentsFocused(TabContents* tab_contents) {
1138 contents_container_->TabContentsFocused(tab_contents); 1137 contents_container_->TabContentsFocused(tab_contents);
1139 } 1138 }
1140 1139
1141 void BrowserView::ShowPageInfo(Profile* profile, 1140 void BrowserView::ShowPageInfo(Profile* profile,
1142 const GURL& url, 1141 const GURL& url,
1143 const NavigationEntry::SSLStatus& ssl, 1142 const NavigationEntry::SSLStatus& ssl,
1144 bool show_history) { 1143 bool show_history) {
1145 browser::ShowPageInfoBubble(this, profile, url, ssl, show_history); 1144 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(),
1145 profile, url, ssl, show_history);
1146 } 1146 }
1147 1147
1148 void BrowserView::ShowAppMenu() { 1148 void BrowserView::ShowAppMenu() {
1149 toolbar_->app_menu()->Activate(); 1149 toolbar_->app_menu()->Activate();
1150 } 1150 }
1151 1151
1152 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 1152 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
1153 bool* is_keyboard_shortcut) { 1153 bool* is_keyboard_shortcut) {
1154 if (event.type != WebKit::WebInputEvent::RawKeyDown) 1154 if (event.type != WebKit::WebInputEvent::RawKeyDown)
1155 return false; 1155 return false;
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2599 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, 2599 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT,
2600 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, 2600 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE,
2601 bubble_view, bubble_view); 2601 bubble_view, bubble_view);
2602 } 2602 }
2603 2603
2604 void BrowserView::ShowAvatarBubbleFromAvatarButton() { 2604 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
2605 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); 2605 AvatarMenuButton* button = frame_->GetAvatarMenuButton();
2606 if (button) 2606 if (button)
2607 button->ShowAvatarBubble(); 2607 button->ShowAvatarBubble();
2608 } 2608 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_dialogs.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698