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

Side by Side Diff: chrome/browser/ui/gtk/gtk_util.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gtk/gtk_util.h" 5 #include "chrome/browser/ui/gtk/gtk_util.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
11 #include <cstdarg> 11 #include <cstdarg>
12 #include <map> 12 #include <map>
13 13
14 #include "app/l10n_util.h" 14 #include "app/l10n_util.h"
15 #include "app/resource_bundle.h"
16 #include "base/environment.h" 15 #include "base/environment.h"
17 #include "base/i18n/rtl.h" 16 #include "base/i18n/rtl.h"
18 #include "base/linux_util.h" 17 #include "base/linux_util.h"
19 #include "base/logging.h" 18 #include "base/logging.h"
20 #include "base/nix/xdg_util.h" 19 #include "base/nix/xdg_util.h"
21 #include "base/string_number_conversions.h" 20 #include "base/string_number_conversions.h"
22 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
23 #include "chrome/browser/autocomplete/autocomplete.h" 22 #include "chrome/browser/autocomplete/autocomplete.h"
24 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 23 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
25 #include "chrome/browser/autocomplete/autocomplete_match.h" 24 #include "chrome/browser/autocomplete/autocomplete_match.h"
26 #include "chrome/browser/browser_list.h" 25 #include "chrome/browser/browser_list.h"
27 #include "chrome/browser/browser_window.h" 26 #include "chrome/browser/browser_window.h"
28 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/renderer_host/render_view_host.h" 28 #include "chrome/browser/renderer_host/render_view_host.h"
30 #include "chrome/browser/tab_contents/tab_contents.h" 29 #include "chrome/browser/tab_contents/tab_contents.h"
31 #include "chrome/browser/ui/gtk/cairo_cached_surface.h" 30 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
32 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 31 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
33 #include "chrome/common/renderer_preferences.h" 32 #include "chrome/common/renderer_preferences.h"
34 #include "gfx/gtk_util.h" 33 #include "gfx/gtk_util.h"
35 #include "googleurl/src/gurl.h" 34 #include "googleurl/src/gurl.h"
36 #include "grit/theme_resources.h" 35 #include "grit/theme_resources.h"
37 #include "third_party/skia/include/core/SkBitmap.h" 36 #include "third_party/skia/include/core/SkBitmap.h"
38 #include "third_party/skia/include/core/SkColor.h" 37 #include "third_party/skia/include/core/SkColor.h"
38 #include "ui/base/resource/resource_bundle.h"
39 #include "ui/base/x/x11_util.h" 39 #include "ui/base/x/x11_util.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "chrome/browser/chromeos/frame/browser_view.h" 42 #include "chrome/browser/chromeos/frame/browser_view.h"
43 #include "chrome/browser/chromeos/native_dialog_window.h" 43 #include "chrome/browser/chromeos/native_dialog_window.h"
44 #include "chrome/browser/chromeos/options/options_window_view.h" 44 #include "chrome/browser/chromeos/options/options_window_view.h"
45 #include "views/window/window.h" 45 #include "views/window/window.h"
46 #else 46 #else
47 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 47 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
48 #endif 48 #endif
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 1241
1242 void DoCopy(BrowserWindow* window) { 1242 void DoCopy(BrowserWindow* window) {
1243 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); 1243 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
1244 } 1244 }
1245 1245
1246 void DoPaste(BrowserWindow* window) { 1246 void DoPaste(BrowserWindow* window) {
1247 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); 1247 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
1248 } 1248 }
1249 1249
1250 } // namespace gtk_util 1250 } // namespace gtk_util
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_provider.cc ('k') | chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698