| 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 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1266 void BrowserView::UserChangedTheme() { | 1266 void BrowserView::UserChangedTheme() { |
| 1267 frame_->FrameTypeChanged(); | 1267 frame_->FrameTypeChanged(); |
| 1268 } | 1268 } |
| 1269 | 1269 |
| 1270 void BrowserView::ShowWebsiteSettings( | 1270 void BrowserView::ShowWebsiteSettings( |
| 1271 Profile* profile, | 1271 Profile* profile, |
| 1272 content::WebContents* web_contents, | 1272 content::WebContents* web_contents, |
| 1273 const GURL& virtual_url, | 1273 const GURL& virtual_url, |
| 1274 const security_state::SecurityInfo& security_info) { | 1274 const security_state::SecurityInfo& security_info) { |
| 1275 WebsiteSettingsPopupView::ShowPopup( | 1275 WebsiteSettingsPopupView::ShowPopup( |
| 1276 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, | 1276 GetLocationBarView()->GetSecurityBubbleAnchorView(), |
| 1277 GetLocationBarView()->location_icon_view(), gfx::Rect(), profile, |
| 1277 web_contents, virtual_url, security_info); | 1278 web_contents, virtual_url, security_info); |
| 1278 } | 1279 } |
| 1279 | 1280 |
| 1280 void BrowserView::ShowAppMenu() { | 1281 void BrowserView::ShowAppMenu() { |
| 1281 if (!toolbar_->app_menu_button()) | 1282 if (!toolbar_->app_menu_button()) |
| 1282 return; | 1283 return; |
| 1283 | 1284 |
| 1284 // Keep the top-of-window views revealed as long as the app menu is visible. | 1285 // Keep the top-of-window views revealed as long as the app menu is visible. |
| 1285 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( | 1286 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( |
| 1286 immersive_mode_controller_->GetRevealedLock( | 1287 immersive_mode_controller_->GetRevealedLock( |
| (...skipping 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2636 } | 2637 } |
| 2637 | 2638 |
| 2638 extensions::ActiveTabPermissionGranter* | 2639 extensions::ActiveTabPermissionGranter* |
| 2639 BrowserView::GetActiveTabPermissionGranter() { | 2640 BrowserView::GetActiveTabPermissionGranter() { |
| 2640 content::WebContents* web_contents = GetActiveWebContents(); | 2641 content::WebContents* web_contents = GetActiveWebContents(); |
| 2641 if (!web_contents) | 2642 if (!web_contents) |
| 2642 return nullptr; | 2643 return nullptr; |
| 2643 return extensions::TabHelper::FromWebContents(web_contents) | 2644 return extensions::TabHelper::FromWebContents(web_contents) |
| 2644 ->active_tab_permission_granter(); | 2645 ->active_tab_permission_granter(); |
| 2645 } | 2646 } |
| OLD | NEW |