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

chrome/browser/ui/global_error/global_error.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/global_error/global_error.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
 #include "grit/theme_resources.h"
-#include "grit/theme_resources_standard.h"
 
 GlobalError::GlobalError()
     : has_shown_bubble_view_(false),
       bubble_view_(NULL) {
 }
 
 GlobalError::~GlobalError() {
 }
 
 int GlobalError::GetBadgeResourceID() {
@@ skipping 25 matching lines @@
 
 int GlobalError::GetBubbleViewIconResourceID() {
   return IDR_INPUT_ALERT;
 }
 
 void GlobalError::BubbleViewDidClose(Browser* browser) {
   DCHECK(browser);
   bubble_view_ = NULL;
   OnBubbleViewDidClose(browser);
 }