Omnibox: Create Field Trial to Always Display Hint Text

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 63bab304e006a7b5ed6f0881bab8b5a2337c09dd..6fd327489c24ab8991f4b22d0f4f9b3bd78d05e5 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/command_updater.h"
+#include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
@@ -226,7 +227,9 @@ void OmniboxViewViews::OnTabChanged(const content::WebContents* web_contents) {
 }
 
 void OmniboxViewViews::Update() {
-  if (chrome::ShouldDisplayOriginChip() || chrome::ShouldDisplayOriginChipV2())
+  if (chrome::ShouldDisplayOriginChip() ||
+      chrome::ShouldDisplayOriginChipV2() ||
+      OmniboxFieldTrial::DisplayHintTextWhenPossible())
     set_placeholder_text(GetHintText());

[Peter Kasting, 2014/04/22 23:40:21]

See bug 363805: This will probably result in showing hint text in tab-to-search
mode.

I think we should fix this before turning it on via field trial, in case it
affects any metrics.

[Mark P, 2014/04/22 23:42:55]

I don't mind hint text in tab-to-search mode.  But wrong hint text could be a
problem.  I think you're right: this should wait until that bug is fixed.

 
   const ToolbarModel::SecurityLevel old_security_level = security_level_;