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

ui/views/controls/throbber.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 "ui/views/controls/throbber.h"
 
 #include "base/time.h"
 #include "grit/ui_resources.h"
-#include "grit/ui_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace views {
 
@@ skipping 140 matching lines @@
   }
   // Otherwise we paint our tick mark or nothing depending on our state.
   if (checked_) {
     int checkmark_x = (width() - checkmark_->width()) / 2;
     int checkmark_y = (height() - checkmark_->height()) / 2;
     canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y);
   }
 }
 
 }  // namespace views