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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Fixed issues. Also rebased Created 3 years, 9 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 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 void BrowserView::UserChangedTheme() { 1284 void BrowserView::UserChangedTheme() {
1285 frame_->FrameTypeChanged(); 1285 frame_->FrameTypeChanged();
1286 } 1286 }
1287 1287
1288 void BrowserView::ShowPageInfo( 1288 void BrowserView::ShowPageInfo(
1289 Profile* profile, 1289 Profile* profile,
1290 content::WebContents* web_contents, 1290 content::WebContents* web_contents,
1291 const GURL& virtual_url, 1291 const GURL& virtual_url,
1292 const security_state::SecurityInfo& security_info) { 1292 const security_state::SecurityInfo& security_info) {
1293 PageInfoPopupView::ShowPopup( 1293 PageInfoPopupView::ShowPopup(
1294 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, 1294 GetLocationBarView()->GetSecurityBubbleAnchorView(),
1295 GetLocationBarView()->location_icon_view(), gfx::Rect(), profile,
1295 web_contents, virtual_url, security_info); 1296 web_contents, virtual_url, security_info);
1296 } 1297 }
1297 1298
1298 void BrowserView::ShowAppMenu() { 1299 void BrowserView::ShowAppMenu() {
1299 if (!toolbar_->app_menu_button()) 1300 if (!toolbar_->app_menu_button())
1300 return; 1301 return;
1301 1302
1302 // Keep the top-of-window views revealed as long as the app menu is visible. 1303 // Keep the top-of-window views revealed as long as the app menu is visible.
1303 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( 1304 std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
1304 immersive_mode_controller_->GetRevealedLock( 1305 immersive_mode_controller_->GetRevealedLock(
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
2684 } 2685 }
2685 2686
2686 extensions::ActiveTabPermissionGranter* 2687 extensions::ActiveTabPermissionGranter*
2687 BrowserView::GetActiveTabPermissionGranter() { 2688 BrowserView::GetActiveTabPermissionGranter() {
2688 content::WebContents* web_contents = GetActiveWebContents(); 2689 content::WebContents* web_contents = GetActiveWebContents();
2689 if (!web_contents) 2690 if (!web_contents)
2690 return nullptr; 2691 return nullptr;
2691 return extensions::TabHelper::FromWebContents(web_contents) 2692 return extensions::TabHelper::FromWebContents(web_contents)
2692 ->active_tab_permission_granter(); 2693 ->active_tab_permission_granter();
2693 } 2694 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698