TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index a7a6e6063ac02e7b1f2f46b8802e6bed7f1929d4..9093197b94f0860e928f32c79309d7fd005fe399 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -42,9 +42,7 @@
 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h"
-#import "chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
-#import "chrome/browser/ui/cocoa/location_bar/search_button_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"
@@ -113,7 +111,6 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
       mic_search_decoration_(new MicSearchDecoration(command_updater)),
       generated_credit_card_decoration_(
           new GeneratedCreditCardDecoration(this)),
-      search_button_decoration_(new SearchButtonDecoration(this)),
       manage_passwords_decoration_(
           new ManagePasswordsDecoration(command_updater, this)),
       browser_(browser),
@@ -135,10 +132,6 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
   [[field_ cell] setIsPopupMode:
       !browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)];
 
-  if (chrome::ShouldDisplayOriginChip())
-    origin_chip_decoration_.reset(new OriginChipDecoration(
-        this, location_icon_decoration_.get()));
-
   // Sets images for the decorations, and performs a layout. This call ensures
   // that this class is in a consistent state after initialization.
   OnChanged();
@@ -368,9 +361,7 @@ NSPoint LocationBarViewMac::GetManagePasswordsBubblePoint() const {
 }
 
 NSPoint LocationBarViewMac::GetPageInfoBubblePoint() const {
-  if (origin_chip_decoration_ && origin_chip_decoration_->IsVisible()) {
-    return [field_ bubblePointForDecoration:origin_chip_decoration_.get()];
-  } else if (ev_bubble_decoration_->IsVisible()) {
+  if (ev_bubble_decoration_->IsVisible()) {
     return [field_ bubblePointForDecoration:ev_bubble_decoration_.get()];
   } else {
     return [field_ bubblePointForDecoration:location_icon_decoration_.get()];
@@ -400,13 +391,9 @@ void LocationBarViewMac::Layout() {
   // the constructor.  I am still wrestling with how best to deal with
   // right-hand decorations, which are not a static set.
   [cell clearDecorations];
-  if (origin_chip_decoration_.get())
-    [cell addLeftDecoration:origin_chip_decoration_.get()];
   [cell addLeftDecoration:location_icon_decoration_.get()];
   [cell addLeftDecoration:selected_keyword_decoration_.get()];
-  if (!origin_chip_decoration_.get())
-    [cell addLeftDecoration:ev_bubble_decoration_.get()];
-  [cell addRightDecoration:search_button_decoration_.get()];
+  [cell addLeftDecoration:ev_bubble_decoration_.get()];
   [cell addRightDecoration:star_decoration_.get()];
   [cell addRightDecoration:translate_decoration_.get()];
   [cell addRightDecoration:zoom_decoration_.get()];
@@ -428,8 +415,7 @@ void LocationBarViewMac::Layout() {
   [cell addRightDecoration:mic_search_decoration_.get()];
 
   // By default only the location icon is visible.
-  location_icon_decoration_->SetVisible(!origin_chip_decoration_.get() ||
-                                        !origin_chip_decoration_->IsVisible());
+  location_icon_decoration_->SetVisible(true);
   selected_keyword_decoration_->SetVisible(false);
   ev_bubble_decoration_->SetVisible(false);
   keyword_hint_decoration_->SetVisible(false);
@@ -451,7 +437,7 @@ void LocationBarViewMac::Layout() {
     selected_keyword_decoration_->SetKeyword(short_name, is_extension_keyword);
     selected_keyword_decoration_->SetImage(GetKeywordImage(keyword));
   } else if ((GetToolbarModel()->GetSecurityLevel(false) ==
-              ToolbarModel::EV_SECURE) && !origin_chip_decoration_.get()) {
+              ToolbarModel::EV_SECURE)) {
     // Switch from location icon to show the EV bubble instead.
     location_icon_decoration_->SetVisible(false);
     ev_bubble_decoration_->SetVisible(true);
@@ -552,25 +538,6 @@ void LocationBarViewMac::OnChanged() {
   NSImage* image = OmniboxViewMac::ImageForResource(resource_id);
   location_icon_decoration_->SetImage(image);
   ev_bubble_decoration_->SetImage(image);
-
-  if (origin_chip_decoration_.get())
-    origin_chip_decoration_->Update();
-
-  ToolbarModel* toolbar_model = GetToolbarModel();
-  const chrome::DisplaySearchButtonConditions conditions =
-      chrome::GetDisplaySearchButtonConditions();
-  const bool meets_conditions =

[Justin Donnelly, 2014/12/03 16:07:25]

I'm really sad to see these features ripped out. But on the other hand, I'm
thrilled to see some of the boolean gymnastics like this statement eliminated.

[groby-ooo-7-16, 2015/01/10 00:54:06]

Acknowledged.

-      (conditions == chrome::DISPLAY_SEARCH_BUTTON_ALWAYS) ||
-      ((conditions != chrome::DISPLAY_SEARCH_BUTTON_NEVER) &&
-       (toolbar_model->WouldPerformSearchTermReplacement(true) ||
-        ((conditions == chrome::DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP) &&
-         toolbar_model->input_in_progress())));
-  search_button_decoration_->SetVisible(
-      ![[field_ cell] isPopupMode] && meets_conditions);
-  search_button_decoration_->SetIcon(
-      (resource_id == IDR_OMNIBOX_SEARCH) ?
-          IDR_OMNIBOX_SEARCH_BUTTON_LOUPE : IDR_OMNIBOX_SEARCH_BUTTON_ARROW);
-
   Layout();
 
   InstantService* instant_service =
@@ -590,13 +557,6 @@ void LocationBarViewMac::ShowURL() {
   omnibox_view_->ShowURL();
 }
 
-void LocationBarViewMac::HideURL() {
-  omnibox_view_->HideURL();
-}
-
-void LocationBarViewMac::EndOriginChipAnimations(bool cancel_fade) {
-}
-
 InstantController* LocationBarViewMac::GetInstant() {
   return browser_->instant_controller() ?
       browser_->instant_controller()->instant() : NULL;