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

chrome/browser/ui/cocoa/history_overlay_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
 
 #include "base/logging.h"
-#include "grit/theme_resources_standard.h"
+#include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 
 // Constants ///////////////////////////////////////////////////////////////////
 
 // The radius of the circle drawn in the shield.
@@ skipping 140 matching lines @@
   [dictionary setObject:animation forKey:@"alphaValue"];
   [overlay setAnimations:dictionary];
   [[overlay animator] setAlphaValue:0.0];
 }
 
 - (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished {
   [self.view removeFromSuperview];
 }
 
 @end