Merge grd files in ui/resources and chrome/app/theme

chrome/browser/ui/intents/web_intent_picker_model.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/intents/web_intent_picker_model.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 const size_t kMaxSuggestionCount = 5;  // Maximum number of visible suggestions.
 
 }  // namespace
 
 WebIntentPickerModel::WebIntentPickerModel()
@@ skipping 146 matching lines @@
     double average_rating)
     : title(title),
       id(id),
       average_rating(average_rating),
       icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)) {
 }
 
 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
 }