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

chrome/browser/ui/gtk/throbber_gtk.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/gtk/throbber_gtk.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
 #include "ui/base/animation/tween.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 
 namespace {
 
 // The length of a single cycle of the animation in milliseconds.
 const int kThrobberDurationMs = 750;
 
 }  // namespace
 
@@ skipping 72 matching lines @@
 void ThrobberGtk::LoadFrames() {
   frames_ = theme_service_->GetImageNamed(IDR_THROBBER);
   DCHECK(frames_);
   const int width = frames_->ToCairo()->Width();
   const int height = frames_->ToCairo()->Height();
   DCHECK_EQ(0, width % height);
   num_frames_ = width / height;
 
   gtk_widget_set_size_request(widget_.get(), height, height);
 }