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

chrome/browser/ui/views/location_bar/zoom_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 "chrome/browser/ui/views/location_bar/zoom_view.h"
 
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources_standard.h"
+#include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 
 ZoomView::ZoomView(ToolbarModel* toolbar_model)
     : toolbar_model_(toolbar_model),
       zoom_icon_state_(ZoomController::NONE),
       zoom_percent_(100) {
   set_accessibility_focusable(true);
@@ skipping 54 matching lines @@
 }
 
 bool ZoomView::OnKeyPressed(const views::KeyEvent& event) {
   if (event.key_code() != ui::VKEY_SPACE &&
       event.key_code() != ui::VKEY_RETURN)
     return false;
 
   ZoomBubbleView::ShowBubble(this, zoom_percent_, false);
   return true;
 }