Merge 143605 - grd file update for new 2x assets

chrome/browser/ui/panels/panel_browser_titlebar_gtk.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/panels/panel_browser_titlebar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_window_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 // Padding around the titlebar.
 const int kPanelTitlebarPaddingTop = 7;
@@ skipping 322 matching lines @@
 }
 
 void PanelBrowserTitlebarGtk::set_window(GtkWindow* window) {
   window_ = window;
 }
 
 AvatarMenuButtonGtk* PanelBrowserTitlebarGtk::avatar_button() const {
   // Not supported in panel.
   return NULL;
 }