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 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1283 void BrowserView::UserChangedTheme() { | 1283 void BrowserView::UserChangedTheme() { |
1284 frame_->FrameTypeChanged(); | 1284 frame_->FrameTypeChanged(); |
1285 } | 1285 } |
1286 | 1286 |
1287 void BrowserView::ShowWebsiteSettings( | 1287 void BrowserView::ShowWebsiteSettings( |
1288 Profile* profile, | 1288 Profile* profile, |
1289 content::WebContents* web_contents, | 1289 content::WebContents* web_contents, |
1290 const GURL& virtual_url, | 1290 const GURL& virtual_url, |
1291 const security_state::SecurityInfo& security_info) { | 1291 const security_state::SecurityInfo& security_info) { |
1292 WebsiteSettingsPopupView::ShowPopup( | 1292 WebsiteSettingsPopupView::ShowPopup( |
1293 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, | 1293 GetLocationBarView()->GetSecurityBubbleAnchorView(), |
| 1294 GetLocationBarView()->location_icon_view(), gfx::Rect(), profile, |
1294 web_contents, virtual_url, security_info); | 1295 web_contents, virtual_url, security_info); |
1295 } | 1296 } |
1296 | 1297 |
1297 void BrowserView::ShowAppMenu() { | 1298 void BrowserView::ShowAppMenu() { |
1298 if (!toolbar_->app_menu_button()) | 1299 if (!toolbar_->app_menu_button()) |
1299 return; | 1300 return; |
1300 | 1301 |
1301 // Keep the top-of-window views revealed as long as the app menu is visible. | 1302 // Keep the top-of-window views revealed as long as the app menu is visible. |
1302 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( | 1303 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( |
1303 immersive_mode_controller_->GetRevealedLock( | 1304 immersive_mode_controller_->GetRevealedLock( |
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2672 } | 2673 } |
2673 | 2674 |
2674 extensions::ActiveTabPermissionGranter* | 2675 extensions::ActiveTabPermissionGranter* |
2675 BrowserView::GetActiveTabPermissionGranter() { | 2676 BrowserView::GetActiveTabPermissionGranter() { |
2676 content::WebContents* web_contents = GetActiveWebContents(); | 2677 content::WebContents* web_contents = GetActiveWebContents(); |
2677 if (!web_contents) | 2678 if (!web_contents) |
2678 return nullptr; | 2679 return nullptr; |
2679 return extensions::TabHelper::FromWebContents(web_contents) | 2680 return extensions::TabHelper::FromWebContents(web_contents) |
2680 ->active_tab_permission_granter(); | 2681 ->active_tab_permission_granter(); |
2681 } | 2682 } |
OLD | NEW |