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

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

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

Powered by Google App Engine
This is Rietveld 408576698