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

ash/system/tray/tray_notification_view.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 "ash/system/tray/tray_notification_view.h"
 
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace ash {
 namespace internal {
 
 TrayNotificationView::TrayNotificationView(SystemTrayItem* tray, int icon_id)
@@ skipping 112 matching lines @@
   tray_->HideNotificationView();
 }
 
 void TrayNotificationView::HandleClickAction() {
   HandleClose();
   OnClickAction();
 }
 
 }  // namespace internal
 }  // namespace ash