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

Side by Side Diff: webkit/plugins/npapi/webplugin_delegate_impl_gtk.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 | « webkit/plugins/npapi/webplugin_delegate_impl.h ('k') | webkit/plugins/npapi/webplugin_impl.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "webkit/plugins/npapi/webplugin_delegate_impl.h" 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
11 #include <gdk/gdkx.h> 11 #include <gdk/gdkx.h>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/process_util.h" 16 #include "base/process_util.h"
17 #include "base/metrics/stats_counters.h" 17 #include "base/metrics/stats_counters.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "gfx/blit.h"
20 #include "skia/ext/platform_canvas.h" 19 #include "skia/ext/platform_canvas.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
22 #include "ui/gfx/blit.h"
23 #include "webkit/glue/webkit_glue.h" 23 #include "webkit/glue/webkit_glue.h"
24 #include "webkit/plugins/npapi/gtk_plugin_container.h" 24 #include "webkit/plugins/npapi/gtk_plugin_container.h"
25 #include "webkit/plugins/npapi/plugin_constants_win.h" 25 #include "webkit/plugins/npapi/plugin_constants_win.h"
26 #include "webkit/plugins/npapi/plugin_instance.h" 26 #include "webkit/plugins/npapi/plugin_instance.h"
27 #include "webkit/plugins/npapi/plugin_lib.h" 27 #include "webkit/plugins/npapi/plugin_lib.h"
28 #include "webkit/plugins/npapi/plugin_list.h" 28 #include "webkit/plugins/npapi/plugin_list.h"
29 #include "webkit/plugins/npapi/plugin_stream_url.h" 29 #include "webkit/plugins/npapi/plugin_stream_url.h"
30 #include "webkit/plugins/npapi/webplugin.h" 30 #include "webkit/plugins/npapi/webplugin.h"
31 31
32 #include "third_party/npapi/bindings/npapi_x11.h" 32 #include "third_party/npapi/bindings/npapi_x11.h"
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 // as someone might be setting the cursor in the main process as well. 764 // as someone might be setting the cursor in the main process as well.
765 *cursor = current_windowless_cursor_; 765 *cursor = current_windowless_cursor_;
766 } 766 }
767 #endif 767 #endif
768 768
769 return ret; 769 return ret;
770 } 770 }
771 771
772 } // namespace npapi 772 } // namespace npapi
773 } // namespace webkit 773 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/webplugin_delegate_impl.h ('k') | webkit/plugins/npapi/webplugin_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698