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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.h ('k') | chrome/browser/ui/gtk/html_dialog_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/autocomplete/autocomplete_match.h" 23 #include "chrome/browser/autocomplete/autocomplete_match.h"
24 #include "chrome/browser/browser_list.h" 24 #include "chrome/browser/browser_list.h"
25 #include "chrome/browser/browser_window.h" 25 #include "chrome/browser/browser_window.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/renderer_host/render_view_host.h" 27 #include "chrome/browser/renderer_host/render_view_host.h"
28 #include "chrome/browser/tab_contents/tab_contents.h" 28 #include "chrome/browser/tab_contents/tab_contents.h"
29 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 29 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
30 #include "chrome/browser/ui/gtk/cairo_cached_surface.h" 30 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
31 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 31 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
32 #include "chrome/common/renderer_preferences.h" 32 #include "chrome/common/renderer_preferences.h"
33 #include "gfx/gtk_util.h"
34 #include "googleurl/src/gurl.h" 33 #include "googleurl/src/gurl.h"
35 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
36 #include "third_party/skia/include/core/SkBitmap.h" 35 #include "third_party/skia/include/core/SkBitmap.h"
37 #include "third_party/skia/include/core/SkColor.h" 36 #include "third_party/skia/include/core/SkColor.h"
38 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/base/x/x11_util.h" 39 #include "ui/base/x/x11_util.h"
40 #include "ui/gfx/gtk_util.h"
41 41
42 using WebKit::WebDragOperationsMask; 42 using WebKit::WebDragOperationsMask;
43 using WebKit::WebDragOperation; 43 using WebKit::WebDragOperation;
44 using WebKit::WebDragOperationNone; 44 using WebKit::WebDragOperationNone;
45 using WebKit::WebDragOperationCopy; 45 using WebKit::WebDragOperationCopy;
46 using WebKit::WebDragOperationLink; 46 using WebKit::WebDragOperationLink;
47 using WebKit::WebDragOperationMove; 47 using WebKit::WebDragOperationMove;
48 48
49 namespace { 49 namespace {
50 50
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 1131
1132 void DoCopy(BrowserWindow* window) { 1132 void DoCopy(BrowserWindow* window) {
1133 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); 1133 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
1134 } 1134 }
1135 1135
1136 void DoPaste(BrowserWindow* window) { 1136 void DoPaste(BrowserWindow* window) {
1137 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); 1137 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
1138 } 1138 }
1139 1139
1140 } // namespace gtk_util 1140 } // namespace gtk_util
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.h ('k') | chrome/browser/ui/gtk/html_dialog_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698