| 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 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 | 1284 |
| 1285 void BrowserView::UserChangedTheme() { | 1285 void BrowserView::UserChangedTheme() { |
| 1286 frame_->FrameTypeChanged(); | 1286 frame_->FrameTypeChanged(); |
| 1287 } | 1287 } |
| 1288 | 1288 |
| 1289 void BrowserView::ShowPageInfo( | 1289 void BrowserView::ShowPageInfo( |
| 1290 Profile* profile, | 1290 Profile* profile, |
| 1291 content::WebContents* web_contents, | 1291 content::WebContents* web_contents, |
| 1292 const GURL& virtual_url, | 1292 const GURL& virtual_url, |
| 1293 const security_state::SecurityInfo& security_info) { | 1293 const security_state::SecurityInfo& security_info) { |
| 1294 PageInfoPopupView::ShowPopup( | 1294 PageInfoBubbleView::ShowPopup( |
| 1295 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, | 1295 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, |
| 1296 web_contents, virtual_url, security_info); | 1296 web_contents, virtual_url, security_info); |
| 1297 } | 1297 } |
| 1298 | 1298 |
| 1299 void BrowserView::ShowAppMenu() { | 1299 void BrowserView::ShowAppMenu() { |
| 1300 if (!toolbar_->app_menu_button()) | 1300 if (!toolbar_->app_menu_button()) |
| 1301 return; | 1301 return; |
| 1302 | 1302 |
| 1303 // Keep the top-of-window views revealed as long as the app menu is visible. | 1303 // Keep the top-of-window views revealed as long as the app menu is visible. |
| 1304 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( | 1304 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( |
| (...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2686 } | 2686 } |
| 2687 | 2687 |
| 2688 extensions::ActiveTabPermissionGranter* | 2688 extensions::ActiveTabPermissionGranter* |
| 2689 BrowserView::GetActiveTabPermissionGranter() { | 2689 BrowserView::GetActiveTabPermissionGranter() { |
| 2690 content::WebContents* web_contents = GetActiveWebContents(); | 2690 content::WebContents* web_contents = GetActiveWebContents(); |
| 2691 if (!web_contents) | 2691 if (!web_contents) |
| 2692 return nullptr; | 2692 return nullptr; |
| 2693 return extensions::TabHelper::FromWebContents(web_contents) | 2693 return extensions::TabHelper::FromWebContents(web_contents) |
| 2694 ->active_tab_permission_granter(); | 2694 ->active_tab_permission_granter(); |
| 2695 } | 2695 } |
| OLD | NEW |