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

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

Issue 1280673003: [Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enabledialogs
Patch Set: Address comments. Created 5 years, 4 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 <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 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 content::WebContents* web_contents, 1361 content::WebContents* web_contents,
1362 const GURL& url, 1362 const GURL& url,
1363 const content::SSLStatus& ssl) { 1363 const content::SSLStatus& ssl) {
1364 // Some browser windows have a location icon embedded in the frame. Try to 1364 // Some browser windows have a location icon embedded in the frame. Try to
1365 // use that if it exists. If it doesn't exist, use the location icon from 1365 // use that if it exists. If it doesn't exist, use the location icon from
1366 // the location bar. 1366 // the location bar.
1367 views::View* popup_anchor = frame_->GetLocationIconView(); 1367 views::View* popup_anchor = frame_->GetLocationIconView();
1368 if (!popup_anchor) 1368 if (!popup_anchor)
1369 popup_anchor = GetLocationBarView()->location_icon_view(); 1369 popup_anchor = GetLocationBarView()->location_icon_view();
1370 1370
1371 WebsiteSettingsPopupView::ShowPopup(popup_anchor, profile, web_contents, url, 1371 WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile,
1372 ssl); 1372 web_contents, url, ssl);
1373 } 1373 }
1374 1374
1375 void BrowserView::ShowAppMenu() { 1375 void BrowserView::ShowAppMenu() {
1376 // Keep the top-of-window views revealed as long as the app menu is visible. 1376 // Keep the top-of-window views revealed as long as the app menu is visible.
1377 scoped_ptr<ImmersiveRevealedLock> revealed_lock( 1377 scoped_ptr<ImmersiveRevealedLock> revealed_lock(
1378 immersive_mode_controller_->GetRevealedLock( 1378 immersive_mode_controller_->GetRevealedLock(
1379 ImmersiveModeController::ANIMATE_REVEAL_NO)); 1379 ImmersiveModeController::ANIMATE_REVEAL_NO));
1380 1380
1381 toolbar_->app_menu()->Activate(); 1381 toolbar_->app_menu()->Activate();
1382 } 1382 }
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 return immersive_mode_controller()->IsEnabled(); 2618 return immersive_mode_controller()->IsEnabled();
2619 } 2619 }
2620 2620
2621 views::Widget* BrowserView::GetBubbleAssociatedWidget() { 2621 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
2622 return GetWidget(); 2622 return GetWidget();
2623 } 2623 }
2624 2624
2625 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { 2625 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
2626 return top_container_->GetBoundsInScreen(); 2626 return top_container_->GetBoundsInScreen();
2627 } 2627 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698