Move omnibox icons to components (1/2)

chrome/browser/ui/omnibox/omnibox_view.cc

Index: chrome/browser/ui/omnibox/omnibox_view.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc
index 8071b4422cf7d6da572d483524383010b5b00578..ca8c290cf626a0e77fe554dd55170a054a94fbb7 100644
--- a/chrome/browser/ui/omnibox/omnibox_view.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view.cc
@@ -17,7 +17,9 @@
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
+#include "grit/component_scaled_resources.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -120,8 +122,11 @@ bool OmniboxView::IsEditingOrEmpty() const {
 int OmniboxView::GetIcon() const {
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetIcon();
-  return AutocompleteMatch::TypeToLocationBarIcon(model_.get() ?
+  int id = AutocompleteMatch::TypeToIcon(model_.get() ?
       model_->CurrentTextType() : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
+  if (id == IDR_OMNIBOX_HTTP)
+    return IDR_LOCATION_BAR_HTTP;
+  return id;

[Peter Kasting, 2014/07/24 18:40:17]

Nit: Simpler:

  return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id;

[hashimoto, 2014/07/25 05:23:23]

Done.

 }
 
 base::string16 OmniboxView::GetHintText() const {