Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 } 1397 }
1398 1398
1399 void BrowserView::UserChangedTheme() { 1399 void BrowserView::UserChangedTheme() {
1400 frame_->FrameTypeChanged(); 1400 frame_->FrameTypeChanged();
1401 } 1401 }
1402 1402
1403 void BrowserView::ShowWebsiteSettings( 1403 void BrowserView::ShowWebsiteSettings(
1404 Profile* profile, 1404 Profile* profile,
1405 content::WebContents* web_contents, 1405 content::WebContents* web_contents,
1406 const GURL& url, 1406 const GURL& url,
1407 const SecurityStateModel::SecurityInfo& security_info) { 1407 const security_state::SecurityStateModel::SecurityInfo& security_info) {
1408 // Some browser windows have a location icon embedded in the frame. Try to 1408 // Some browser windows have a location icon embedded in the frame. Try to
1409 // use that if it exists. If it doesn't exist, use the location icon from 1409 // use that if it exists. If it doesn't exist, use the location icon from
1410 // the location bar. 1410 // the location bar.
1411 views::View* popup_anchor = frame_->GetLocationIconView(); 1411 views::View* popup_anchor = frame_->GetLocationIconView();
1412 if (!popup_anchor) 1412 if (!popup_anchor)
1413 popup_anchor = GetLocationBarView()->location_icon_view(); 1413 popup_anchor = GetLocationBarView()->location_icon_view();
1414 1414
1415 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile, 1415 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile,
1416 web_contents, url, security_info); 1416 web_contents, url, security_info);
1417 } 1417 }
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 return immersive_mode_controller()->IsEnabled(); 2678 return immersive_mode_controller()->IsEnabled();
2679 } 2679 }
2680 2680
2681 views::Widget* BrowserView::GetBubbleAssociatedWidget() { 2681 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
2682 return GetWidget(); 2682 return GetWidget();
2683 } 2683 }
2684 2684
2685 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { 2685 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
2686 return top_container_->GetBoundsInScreen(); 2686 return top_container_->GetBoundsInScreen();
2687 } 2687 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698