[OriginChip] Add an option to display only on search result pages.

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index 50df4f2e268ce70cf1ae3ba36a9ec5fd7632466f..bc88c23c449ece28ffd8be7b80c2c3e85a591208 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -183,7 +183,15 @@ bool ToolbarModelImpl::WouldOmitURLDueToOriginChip() const {
   }
 
   bool should_display_origin_chip =
-      chrome::ShouldDisplayOriginChip() || chrome::ShouldDisplayOriginChipV2();
+      chrome::ShouldDisplayOriginChip() ||
+      chrome::GetOriginChipV2Condition() ==

[Peter Kasting, 2014/05/08 21:32:31]

Nit: Let's factor out some variable called chip_condition or something so we
don't call this multiple times.

Then the end of this function could be broken into a series of shorter
statements:

  if (!delegate_->InTabbedBrowser() || !ShouldDisplayURL() ||
      !url_replacement_enabled())
    return false;

  if (chrome::ShouldDisplayOriginChip())
    return true;

  const chrome::OriginChipV2Condition chip_condition =
      chrome::GetOriginChipV2Condition();
  return (chip_condition != chrome::ORIGIN_CHIP_V2_DISABLED) &&
      ((chip_condition != chrome::ORIGIN_CHIP_V2_ON_SRP) ||
       WouldPerformSearchTermReplacement(false));

[Justin Donnelly, 2014/05/08 22:27:16]

Done.

+          chrome::ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE ||
+      chrome::GetOriginChipV2Condition() ==
+          chrome::ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT ||
+      (chrome::GetOriginChipV2Condition() ==
+           chrome::ORIGIN_CHIP_V2_ON_SRP &&
+       WouldPerformSearchTermReplacement(false));
+
   return should_display_origin_chip && delegate_->InTabbedBrowser() &&
       ShouldDisplayURL() && url_replacement_enabled();
 }