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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <memory> | 10 #include <memory> |
(...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1287 void BrowserView::UserChangedTheme() { | 1287 void BrowserView::UserChangedTheme() { |
1288 frame_->FrameTypeChanged(); | 1288 frame_->FrameTypeChanged(); |
1289 } | 1289 } |
1290 | 1290 |
1291 void BrowserView::ShowPageInfo( | 1291 void BrowserView::ShowPageInfo( |
1292 Profile* profile, | 1292 Profile* profile, |
1293 content::WebContents* web_contents, | 1293 content::WebContents* web_contents, |
1294 const GURL& virtual_url, | 1294 const GURL& virtual_url, |
1295 const security_state::SecurityInfo& security_info) { | 1295 const security_state::SecurityInfo& security_info) { |
1296 PageInfoBubbleView::ShowBubble( | 1296 PageInfoBubbleView::ShowBubble( |
1297 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, | 1297 GetLocationBarView()->GetSecurityBubbleAnchorView(), |
| 1298 GetLocationBarView()->location_icon_view(), gfx::Rect(), profile, |
1298 web_contents, virtual_url, security_info); | 1299 web_contents, virtual_url, security_info); |
1299 } | 1300 } |
1300 | 1301 |
1301 void BrowserView::ShowAppMenu() { | 1302 void BrowserView::ShowAppMenu() { |
1302 if (!toolbar_->app_menu_button()) | 1303 if (!toolbar_->app_menu_button()) |
1303 return; | 1304 return; |
1304 | 1305 |
1305 // Keep the top-of-window views revealed as long as the app menu is visible. | 1306 // Keep the top-of-window views revealed as long as the app menu is visible. |
1306 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( | 1307 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( |
1307 immersive_mode_controller_->GetRevealedLock( | 1308 immersive_mode_controller_->GetRevealedLock( |
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2692 } | 2693 } |
2693 | 2694 |
2694 extensions::ActiveTabPermissionGranter* | 2695 extensions::ActiveTabPermissionGranter* |
2695 BrowserView::GetActiveTabPermissionGranter() { | 2696 BrowserView::GetActiveTabPermissionGranter() { |
2696 content::WebContents* web_contents = GetActiveWebContents(); | 2697 content::WebContents* web_contents = GetActiveWebContents(); |
2697 if (!web_contents) | 2698 if (!web_contents) |
2698 return nullptr; | 2699 return nullptr; |
2699 return extensions::TabHelper::FromWebContents(web_contents) | 2700 return extensions::TabHelper::FromWebContents(web_contents) |
2700 ->active_tab_permission_granter(); | 2701 ->active_tab_permission_granter(); |
2701 } | 2702 } |
OLD | NEW |