| 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 } | 1422 } |
| 1423 | 1423 |
| 1424 void BrowserView::UserChangedTheme() { | 1424 void BrowserView::UserChangedTheme() { |
| 1425 frame_->FrameTypeChanged(); | 1425 frame_->FrameTypeChanged(); |
| 1426 } | 1426 } |
| 1427 | 1427 |
| 1428 void BrowserView::ShowWebsiteSettings( | 1428 void BrowserView::ShowWebsiteSettings( |
| 1429 Profile* profile, | 1429 Profile* profile, |
| 1430 content::WebContents* web_contents, | 1430 content::WebContents* web_contents, |
| 1431 const GURL& url, | 1431 const GURL& url, |
| 1432 const SecurityStateModel::SecurityInfo& security_info) { | 1432 const security_state::SecurityStateModel::SecurityInfo& security_info) { |
| 1433 // Some browser windows have a location icon embedded in the frame. Try to | 1433 // Some browser windows have a location icon embedded in the frame. Try to |
| 1434 // use that if it exists. If it doesn't exist, use the location icon from | 1434 // use that if it exists. If it doesn't exist, use the location icon from |
| 1435 // the location bar. | 1435 // the location bar. |
| 1436 views::View* popup_anchor = frame_->GetLocationIconView(); | 1436 views::View* popup_anchor = frame_->GetLocationIconView(); |
| 1437 if (!popup_anchor) | 1437 if (!popup_anchor) |
| 1438 popup_anchor = GetLocationBarView()->location_icon_view(); | 1438 popup_anchor = GetLocationBarView()->location_icon_view(); |
| 1439 | 1439 |
| 1440 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, | 1440 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, |
| 1441 web_contents, url, security_info); | 1441 web_contents, url, security_info); |
| 1442 } | 1442 } |
| (...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2703 return immersive_mode_controller()->IsEnabled(); | 2703 return immersive_mode_controller()->IsEnabled(); |
| 2704 } | 2704 } |
| 2705 | 2705 |
| 2706 views::Widget* BrowserView::GetBubbleAssociatedWidget() { | 2706 views::Widget* BrowserView::GetBubbleAssociatedWidget() { |
| 2707 return GetWidget(); | 2707 return GetWidget(); |
| 2708 } | 2708 } |
| 2709 | 2709 |
| 2710 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { | 2710 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { |
| 2711 return top_container_->GetBoundsInScreen(); | 2711 return top_container_->GetBoundsInScreen(); |
| 2712 } | 2712 } |
| OLD | NEW |