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 #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 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1203 } | 1203 } |
1204 | 1204 |
1205 void BrowserView::ShowPageInfo(Profile* profile, | 1205 void BrowserView::ShowPageInfo(Profile* profile, |
1206 const GURL& url, | 1206 const GURL& url, |
1207 const SSLStatus& ssl, | 1207 const SSLStatus& ssl, |
1208 bool show_history) { | 1208 bool show_history) { |
1209 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), | 1209 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), |
1210 profile, url, ssl, show_history); | 1210 profile, url, ssl, show_history); |
1211 } | 1211 } |
1212 | 1212 |
| 1213 void BrowserView::ShowWebsiteSettings(Profile* profile, |
| 1214 TabContentsWrapper* tab_contents_wrapper, |
| 1215 const GURL& url, |
| 1216 const content::SSLStatus& ssl, |
| 1217 bool show_history) { |
| 1218 } |
| 1219 |
1213 void BrowserView::ShowAppMenu() { | 1220 void BrowserView::ShowAppMenu() { |
1214 toolbar_->app_menu()->Activate(); | 1221 toolbar_->app_menu()->Activate(); |
1215 } | 1222 } |
1216 | 1223 |
1217 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1224 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
1218 bool* is_keyboard_shortcut) { | 1225 bool* is_keyboard_shortcut) { |
1219 if (event.type != WebKit::WebInputEvent::RawKeyDown) | 1226 if (event.type != WebKit::WebInputEvent::RawKeyDown) |
1220 return false; | 1227 return false; |
1221 | 1228 |
1222 #if defined(OS_WIN) && !defined(USE_AURA) | 1229 #if defined(OS_WIN) && !defined(USE_AURA) |
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2555 browser::CreateViewsBubble(bubble); | 2562 browser::CreateViewsBubble(bubble); |
2556 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2563 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2557 bubble->Show(); | 2564 bubble->Show(); |
2558 } | 2565 } |
2559 | 2566 |
2560 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2567 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2561 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2568 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2562 if (button) | 2569 if (button) |
2563 button->ShowAvatarBubble(); | 2570 button->ShowAvatarBubble(); |
2564 } | 2571 } |
OLD | NEW |