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

Side by Side Diff: chrome/plugin/plugin_thread.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/plugin/plugin_channel_base.h ('k') | chrome/plugin/webplugin_delegate_stub.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 "chrome/plugin/plugin_thread.h" 5 #include "chrome/plugin/plugin_thread.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(USE_X11) 9 #if defined(USE_X11)
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 16 matching lines...) Expand all
27 #include "chrome/plugin/chrome_plugin_host.h" 27 #include "chrome/plugin/chrome_plugin_host.h"
28 #include "chrome/plugin/npobject_util.h" 28 #include "chrome/plugin/npobject_util.h"
29 #include "chrome/renderer/render_thread.h" 29 #include "chrome/renderer/render_thread.h"
30 #include "ipc/ipc_channel_handle.h" 30 #include "ipc/ipc_channel_handle.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 #include "webkit/glue/webkit_glue.h" 32 #include "webkit/glue/webkit_glue.h"
33 #include "webkit/plugins/npapi/plugin_lib.h" 33 #include "webkit/plugins/npapi/plugin_lib.h"
34 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 34 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
35 35
36 #if defined(TOOLKIT_USES_GTK) 36 #if defined(TOOLKIT_USES_GTK)
37 #include "gfx/gtk_util.h" 37 #include "ui/gfx/gtk_util.h"
38 #endif 38 #endif
39 39
40 #if defined(USE_X11) 40 #if defined(USE_X11)
41 #include "ui/base/x/x11_util.h" 41 #include "ui/base/x/x11_util.h"
42 #elif defined(OS_MACOSX) 42 #elif defined(OS_MACOSX)
43 #include "base/mac/mac_util.h" 43 #include "base/mac/mac_util.h"
44 #include "base/mac/scoped_cftyperef.h" 44 #include "base/mac/scoped_cftyperef.h"
45 #include "base/sys_string_conversions.h" 45 #include "base/sys_string_conversions.h"
46 #include "grit/chromium_strings.h" 46 #include "grit/chromium_strings.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 } 228 }
229 229
230 if (!result || net_error != net::OK) 230 if (!result || net_error != net::OK)
231 return false; 231 return false;
232 232
233 *proxy_list = proxy_result; 233 *proxy_list = proxy_result;
234 return true; 234 return true;
235 } 235 }
236 236
237 } // namespace webkit_glue 237 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/plugin/plugin_channel_base.h ('k') | chrome/plugin/webplugin_delegate_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698