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

chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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/views/frame/app_non_client_frame_view_aura.h"
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
-#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
-#include "grit/ui_resources_standard.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ skipping 301 matching lines @@
 bool AppNonClientFrameViewAura::IsShowingControls() const {
   return control_widget_ && control_widget_->IsVisible();
 }
 
 void AppNonClientFrameViewAura::Restore() {
   if (control_widget_)
     control_widget_->Close();
   mouse_watcher_.Stop();
   frame()->Restore();
 }