Update omnibox chips in MD

chrome/browser/ui/views/location_bar/selected_keyword_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 78 matching lines @@
     return;
   DCHECK(profile_);
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (!model)
     return;
 
   bool is_extension_keyword;
   const base::string16 short_name =
       model->GetKeywordShortName(keyword, &is_extension_keyword);
-  const base::string16 full_name = is_extension_keyword ?
-      short_name :
-      l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, short_name);
+  int keyword_text_ids = ui::MaterialDesignController::IsModeMaterial()
+                             ? IDS_OMNIBOX_KEYWORD_TEXT_MD
+                             : IDS_OMNIBOX_KEYWORD_TEXT;
+  const base::string16 full_name =
+      is_extension_keyword ? short_name : l10n_util::GetStringFUTF16(
+                                              keyword_text_ids, short_name);
   full_label_.SetText(full_name);
 
   const base::string16 min_string(
       location_bar_util::CalculateMinString(short_name));
-  const base::string16 partial_name = is_extension_keyword ?
-      min_string :
-      l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
+  const base::string16 partial_name =
+      is_extension_keyword ? min_string : l10n_util::GetStringFUTF16(
+                                              keyword_text_ids, min_string);
   partial_label_.SetText(min_string.empty() ?
       full_label_.text() : partial_name);
 }
 
 const char* SelectedKeywordView::GetClassName() const {
   return "SelectedKeywordView";
 }