Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" 5 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "chrome/browser/themes/theme_service.h" 13 #include "chrome/browser/themes/theme_service.h"
14 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h" 14 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
15 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" 15 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
16 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" 16 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "grit/theme_resources_standard.h"
19 #include "grit/ui_resources.h" 18 #include "grit/ui_resources.h"
20 #include "grit/ui_resources_standard.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 19 #include "third_party/skia/include/core/SkBitmap.h"
22 #include "third_party/skia/include/core/SkCanvas.h" 20 #include "third_party/skia/include/core/SkCanvas.h"
23 #include "third_party/skia/include/core/SkColor.h" 21 #include "third_party/skia/include/core/SkColor.h"
24 #include "third_party/skia/include/core/SkShader.h" 22 #include "third_party/skia/include/core/SkShader.h"
25 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/canvas.h" 24 #include "ui/gfx/canvas.h"
27 #include "ui/gfx/image/image.h" 25 #include "ui/gfx/image/image.h"
28 #include "ui/gfx/rect.h" 26 #include "ui/gfx/rect.h"
29 #include "ui/gfx/size.h" 27 #include "ui/gfx/size.h"
30 #include "ui/gfx/skbitmap_operations.h" 28 #include "ui/gfx/skbitmap_operations.h"
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 948
951 void Gtk2UI::ClearAllThemeData() { 949 void Gtk2UI::ClearAllThemeData() {
952 STLDeleteValues(&gtk_images_); 950 STLDeleteValues(&gtk_images_);
953 } 951 }
954 952
955 } // namespace libgtk2ui 953 } // namespace libgtk2ui
956 954
957 ui::LinuxUI* BuildGtk2UI() { 955 ui::LinuxUI* BuildGtk2UI() {
958 return new libgtk2ui::Gtk2UI; 956 return new libgtk2ui::Gtk2UI;
959 } 957 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_unittest.cc ('k') | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698