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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Fix for bruthig Created 3 years, 7 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 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 void BrowserView::UserChangedTheme() { 1288 void BrowserView::UserChangedTheme() {
1289 frame_->FrameTypeChanged(); 1289 frame_->FrameTypeChanged();
1290 } 1290 }
1291 1291
1292 void BrowserView::ShowPageInfo( 1292 void BrowserView::ShowPageInfo(
1293 Profile* profile, 1293 Profile* profile,
1294 content::WebContents* web_contents, 1294 content::WebContents* web_contents,
1295 const GURL& virtual_url, 1295 const GURL& virtual_url,
1296 const security_state::SecurityInfo& security_info) { 1296 const security_state::SecurityInfo& security_info) {
1297 PageInfoBubbleView::ShowBubble( 1297 PageInfoBubbleView::ShowBubble(
1298 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, 1298 GetLocationBarView()->GetSecurityBubbleAnchorView(),
1299 GetLocationBarView()->location_icon_view(), gfx::Rect(), profile,
1299 web_contents, virtual_url, security_info); 1300 web_contents, virtual_url, security_info);
1300 } 1301 }
1301 1302
1302 void BrowserView::ShowAppMenu() { 1303 void BrowserView::ShowAppMenu() {
1303 if (!toolbar_->app_menu_button()) 1304 if (!toolbar_->app_menu_button())
1304 return; 1305 return;
1305 1306
1306 // Keep the top-of-window views revealed as long as the app menu is visible. 1307 // Keep the top-of-window views revealed as long as the app menu is visible.
1307 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( 1308 std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
1308 immersive_mode_controller_->GetRevealedLock( 1309 immersive_mode_controller_->GetRevealedLock(
(...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 } 2696 }
2696 2697
2697 extensions::ActiveTabPermissionGranter* 2698 extensions::ActiveTabPermissionGranter*
2698 BrowserView::GetActiveTabPermissionGranter() { 2699 BrowserView::GetActiveTabPermissionGranter() {
2699 content::WebContents* web_contents = GetActiveWebContents(); 2700 content::WebContents* web_contents = GetActiveWebContents();
2700 if (!web_contents) 2701 if (!web_contents)
2701 return nullptr; 2702 return nullptr;
2702 return extensions::TabHelper::FromWebContents(web_contents) 2703 return extensions::TabHelper::FromWebContents(web_contents)
2703 ->active_tab_permission_granter(); 2704 ->active_tab_permission_granter();
2704 } 2705 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698