| 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 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1401 } | 1401 } |
| 1402 | 1402 |
| 1403 void BrowserView::UserChangedTheme() { | 1403 void BrowserView::UserChangedTheme() { |
| 1404 frame_->FrameTypeChanged(); | 1404 frame_->FrameTypeChanged(); |
| 1405 } | 1405 } |
| 1406 | 1406 |
| 1407 void BrowserView::ShowWebsiteSettings( | 1407 void BrowserView::ShowWebsiteSettings( |
| 1408 Profile* profile, | 1408 Profile* profile, |
| 1409 content::WebContents* web_contents, | 1409 content::WebContents* web_contents, |
| 1410 const GURL& url, | 1410 const GURL& url, |
| 1411 const SecurityStateModel::SecurityInfo& security_info) { | 1411 const security_state::SecurityStateModel::SecurityInfo& security_info) { |
| 1412 // Some browser windows have a location icon embedded in the frame. Try to | 1412 // Some browser windows have a location icon embedded in the frame. Try to |
| 1413 // use that if it exists. If it doesn't exist, use the location icon from | 1413 // use that if it exists. If it doesn't exist, use the location icon from |
| 1414 // the location bar. | 1414 // the location bar. |
| 1415 views::View* popup_anchor = frame_->GetLocationIconView(); | 1415 views::View* popup_anchor = frame_->GetLocationIconView(); |
| 1416 if (!popup_anchor) | 1416 if (!popup_anchor) |
| 1417 popup_anchor = GetLocationBarView()->location_icon_view(); | 1417 popup_anchor = GetLocationBarView()->location_icon_view(); |
| 1418 | 1418 |
| 1419 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, | 1419 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, |
| 1420 web_contents, url, security_info); | 1420 web_contents, url, security_info); |
| 1421 } | 1421 } |
| (...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2682 return immersive_mode_controller()->IsEnabled(); | 2682 return immersive_mode_controller()->IsEnabled(); |
| 2683 } | 2683 } |
| 2684 | 2684 |
| 2685 views::Widget* BrowserView::GetBubbleAssociatedWidget() { | 2685 views::Widget* BrowserView::GetBubbleAssociatedWidget() { |
| 2686 return GetWidget(); | 2686 return GetWidget(); |
| 2687 } | 2687 } |
| 2688 | 2688 |
| 2689 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { | 2689 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { |
| 2690 return top_container_->GetBoundsInScreen(); | 2690 return top_container_->GetBoundsInScreen(); |
| 2691 } | 2691 } |
| OLD | NEW |