| 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 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 GetNativeWindow(), download_count, dialog_type, app_modal, callback); | 1314 GetNativeWindow(), download_count, dialog_type, app_modal, callback); |
| 1315 } | 1315 } |
| 1316 | 1316 |
| 1317 void BrowserView::UserChangedTheme() { | 1317 void BrowserView::UserChangedTheme() { |
| 1318 frame_->FrameTypeChanged(); | 1318 frame_->FrameTypeChanged(); |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 void BrowserView::ShowWebsiteSettings( | 1321 void BrowserView::ShowWebsiteSettings( |
| 1322 Profile* profile, | 1322 Profile* profile, |
| 1323 content::WebContents* web_contents, | 1323 content::WebContents* web_contents, |
| 1324 const GURL& url, | 1324 const GURL& virtual_url, |
| 1325 const security_state::SecurityStateModel::SecurityInfo& security_info) { | 1325 const security_state::SecurityStateModel::SecurityInfo& security_info) { |
| 1326 // Some browser windows have a location icon embedded in the frame. Try to | 1326 // Some browser windows have a location icon embedded in the frame. Try to |
| 1327 // use that if it exists. If it doesn't exist, use the location icon from | 1327 // use that if it exists. If it doesn't exist, use the location icon from |
| 1328 // the location bar. | 1328 // the location bar. |
| 1329 views::View* popup_anchor = frame_->GetLocationIconView(); | 1329 views::View* popup_anchor = frame_->GetLocationIconView(); |
| 1330 if (!popup_anchor) | 1330 if (!popup_anchor) |
| 1331 popup_anchor = GetLocationBarView()->location_icon_view()->GetImageView(); | 1331 popup_anchor = GetLocationBarView()->location_icon_view()->GetImageView(); |
| 1332 | 1332 |
| 1333 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, | 1333 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, |
| 1334 web_contents, url, security_info); | 1334 web_contents, virtual_url, security_info); |
| 1335 } | 1335 } |
| 1336 | 1336 |
| 1337 void BrowserView::ShowAppMenu() { | 1337 void BrowserView::ShowAppMenu() { |
| 1338 if (!toolbar_->app_menu_button()) | 1338 if (!toolbar_->app_menu_button()) |
| 1339 return; | 1339 return; |
| 1340 | 1340 |
| 1341 // Keep the top-of-window views revealed as long as the app menu is visible. | 1341 // Keep the top-of-window views revealed as long as the app menu is visible. |
| 1342 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( | 1342 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( |
| 1343 immersive_mode_controller_->GetRevealedLock( | 1343 immersive_mode_controller_->GetRevealedLock( |
| 1344 ImmersiveModeController::ANIMATE_REVEAL_NO)); | 1344 ImmersiveModeController::ANIMATE_REVEAL_NO)); |
| (...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2612 } | 2612 } |
| 2613 | 2613 |
| 2614 extensions::ActiveTabPermissionGranter* | 2614 extensions::ActiveTabPermissionGranter* |
| 2615 BrowserView::GetActiveTabPermissionGranter() { | 2615 BrowserView::GetActiveTabPermissionGranter() { |
| 2616 content::WebContents* web_contents = GetActiveWebContents(); | 2616 content::WebContents* web_contents = GetActiveWebContents(); |
| 2617 if (!web_contents) | 2617 if (!web_contents) |
| 2618 return nullptr; | 2618 return nullptr; |
| 2619 return extensions::TabHelper::FromWebContents(web_contents) | 2619 return extensions::TabHelper::FromWebContents(web_contents) |
| 2620 ->active_tab_permission_granter(); | 2620 ->active_tab_permission_granter(); |
| 2621 } | 2621 } |
| OLD | NEW |