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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 <pango/pango.h> 9 #include <pango/pango.h>
10 10
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" 27 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
28 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h" 28 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
29 #include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h" 29 #include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h"
30 #include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h" 30 #include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h"
31 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h" 31 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
32 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" 32 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
33 #include "chrome/browser/ui/libgtk2ui/unity_service.h" 33 #include "chrome/browser/ui/libgtk2ui/unity_service.h"
34 #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h" 34 #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
35 #include "grit/component_scaled_resources.h" 35 #include "grit/component_scaled_resources.h"
36 #include "grit/theme_resources.h" 36 #include "grit/theme_resources.h"
37 #include "grit/ui_resources.h"
38 #include "printing/printing_context_linux.h" 37 #include "printing/printing_context_linux.h"
39 #include "third_party/skia/include/core/SkBitmap.h" 38 #include "third_party/skia/include/core/SkBitmap.h"
40 #include "third_party/skia/include/core/SkCanvas.h" 39 #include "third_party/skia/include/core/SkCanvas.h"
41 #include "third_party/skia/include/core/SkColor.h" 40 #include "third_party/skia/include/core/SkColor.h"
42 #include "third_party/skia/include/core/SkShader.h" 41 #include "third_party/skia/include/core/SkShader.h"
43 #include "ui/base/resource/resource_bundle.h" 42 #include "ui/base/resource/resource_bundle.h"
44 #include "ui/gfx/canvas.h" 43 #include "ui/gfx/canvas.h"
45 #include "ui/gfx/image/image.h" 44 #include "ui/gfx/image/image.h"
46 #include "ui/gfx/pango_util.h" 45 #include "ui/gfx/pango_util.h"
47 #include "ui/gfx/rect.h" 46 #include "ui/gfx/rect.h"
48 #include "ui/gfx/size.h" 47 #include "ui/gfx/size.h"
49 #include "ui/gfx/skbitmap_operations.h" 48 #include "ui/gfx/skbitmap_operations.h"
50 #include "ui/gfx/skia_util.h" 49 #include "ui/gfx/skia_util.h"
50 #include "ui/resources/grit/ui_resources.h"
51 #include "ui/views/controls/button/label_button.h" 51 #include "ui/views/controls/button/label_button.h"
52 #include "ui/views/controls/button/label_button_border.h" 52 #include "ui/views/controls/button/label_button_border.h"
53 #include "ui/views/linux_ui/window_button_order_observer.h" 53 #include "ui/views/linux_ui/window_button_order_observer.h"
54 54
55 #if defined(USE_GCONF) 55 #if defined(USE_GCONF)
56 #include "chrome/browser/ui/libgtk2ui/gconf_listener.h" 56 #include "chrome/browser/ui/libgtk2ui/gconf_listener.h"
57 #endif 57 #endif
58 58
59 // A minimized port of GtkThemeService into something that can provide colors 59 // A minimized port of GtkThemeService into something that can provide colors
60 // and images for aura. 60 // and images for aura.
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 ClearAllThemeData(); 1343 ClearAllThemeData();
1344 LoadGtkValues(); 1344 LoadGtkValues();
1345 NativeThemeGtk2::instance()->NotifyObservers(); 1345 NativeThemeGtk2::instance()->NotifyObservers();
1346 } 1346 }
1347 1347
1348 } // namespace libgtk2ui 1348 } // namespace libgtk2ui
1349 1349
1350 views::LinuxUI* BuildGtk2UI() { 1350 views::LinuxUI* BuildGtk2UI() {
1351 return new libgtk2ui::Gtk2UI; 1351 return new libgtk2ui::Gtk2UI;
1352 } 1352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698