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

ash/system/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_views.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.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 const int kDeviceListHeight = 276;
 }
 
@@ skipping 197 matching lines @@
   BluetoothDeviceList list;
   Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
   if (default_)
     default_->UpdateLabel();
   else if (detailed_)
     detailed_->Update(list);
 }
 
 }  // namespace internal
 }  // namespace ash