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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 286afd2741f5ebcadb9e3a88e98484b1030a9e29..fc8335ad618c688e5107c552680c23af812253a0 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -396,16 +396,7 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate {
- (void)focusLocationBar:(BOOL)selectAll {
if (locationBarView_.get()) {
- if (selectAll &&
- locationBarView_->GetToolbarModel()->WouldOmitURLDueToOriginChip()) {
- // select_all is true when it's expected that the user may want to copy
- // the URL to the clipboard. If the origin chip is being displayed (and
- // thus the URL is not being shown in the Omnibox) show it now to support
- // the same functionality.
- locationBarView_->GetOmniboxView()->ShowURL();
- } else {
- locationBarView_->FocusLocation(selectAll ? true : false);
- }
+ locationBarView_->FocusLocation(selectAll ? true : false);
}
}
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm ('k') | chrome/browser/ui/location_bar/origin_chip_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698