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

Side by Side Diff: chrome/renderer/render_view.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/renderer/render_thread.h ('k') | chrome/renderer/render_view_browsertest.cc » ('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/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #include "chrome/renderer/translate_helper.h" 90 #include "chrome/renderer/translate_helper.h"
91 #include "chrome/renderer/user_script_idle_scheduler.h" 91 #include "chrome/renderer/user_script_idle_scheduler.h"
92 #include "chrome/renderer/user_script_slave.h" 92 #include "chrome/renderer/user_script_slave.h"
93 #include "chrome/renderer/visitedlink_slave.h" 93 #include "chrome/renderer/visitedlink_slave.h"
94 #include "chrome/renderer/web_ui_bindings.h" 94 #include "chrome/renderer/web_ui_bindings.h"
95 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" 95 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
96 #include "chrome/renderer/webplugin_delegate_pepper.h" 96 #include "chrome/renderer/webplugin_delegate_pepper.h"
97 #include "chrome/renderer/webplugin_delegate_proxy.h" 97 #include "chrome/renderer/webplugin_delegate_proxy.h"
98 #include "chrome/renderer/websharedworker_proxy.h" 98 #include "chrome/renderer/websharedworker_proxy.h"
99 #include "chrome/renderer/webworker_proxy.h" 99 #include "chrome/renderer/webworker_proxy.h"
100 #include "gfx/color_utils.h"
101 #include "gfx/favicon_size.h"
102 #include "gfx/native_widget_types.h"
103 #include "gfx/point.h"
104 #include "gfx/rect.h"
105 #include "gfx/skbitmap_operations.h"
106 #include "grit/generated_resources.h" 100 #include "grit/generated_resources.h"
107 #include "grit/renderer_resources.h" 101 #include "grit/renderer_resources.h"
108 #include "media/base/filter_collection.h" 102 #include "media/base/filter_collection.h"
109 #include "media/base/media_switches.h" 103 #include "media/base/media_switches.h"
110 #include "media/base/message_loop_factory_impl.h" 104 #include "media/base/message_loop_factory_impl.h"
111 #include "net/base/data_url.h" 105 #include "net/base/data_url.h"
112 #include "net/base/escape.h" 106 #include "net/base/escape.h"
113 #include "net/base/net_errors.h" 107 #include "net/base/net_errors.h"
114 #include "net/http/http_util.h" 108 #include "net/http/http_util.h"
115 #include "ppapi/c/private/ppb_flash.h" 109 #include "ppapi/c/private/ppb_flash.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" 150 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
157 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" 151 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
158 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" 152 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
159 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 153 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
160 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" 154 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
161 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" 155 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
162 #include "third_party/skia/include/core/SkBitmap.h" 156 #include "third_party/skia/include/core/SkBitmap.h"
163 #include "ui/base/message_box_flags.h" 157 #include "ui/base/message_box_flags.h"
164 #include "ui/base/l10n/l10n_util.h" 158 #include "ui/base/l10n/l10n_util.h"
165 #include "ui/base/resource/resource_bundle.h" 159 #include "ui/base/resource/resource_bundle.h"
160 #include "ui/gfx/color_utils.h"
161 #include "ui/gfx/favicon_size.h"
162 #include "ui/gfx/native_widget_types.h"
163 #include "ui/gfx/point.h"
164 #include "ui/gfx/rect.h"
165 #include "ui/gfx/skbitmap_operations.h"
166 #include "v8/include/v8.h" 166 #include "v8/include/v8.h"
167 #include "v8/include/v8-testing.h" 167 #include "v8/include/v8-testing.h"
168 #include "webkit/appcache/web_application_cache_host_impl.h" 168 #include "webkit/appcache/web_application_cache_host_impl.h"
169 #include "webkit/glue/alt_error_page_resource_fetcher.h" 169 #include "webkit/glue/alt_error_page_resource_fetcher.h"
170 #include "webkit/glue/context_menu.h" 170 #include "webkit/glue/context_menu.h"
171 #include "webkit/glue/dom_operations.h" 171 #include "webkit/glue/dom_operations.h"
172 #include "webkit/glue/form_data.h" 172 #include "webkit/glue/form_data.h"
173 #include "webkit/glue/form_field.h" 173 #include "webkit/glue/form_field.h"
174 #include "webkit/glue/glue_serialize.h" 174 #include "webkit/glue/glue_serialize.h"
175 #include "webkit/glue/image_decoder.h" 175 #include "webkit/glue/image_decoder.h"
(...skipping 10 matching lines...) Expand all
186 #include "webkit/plugins/npapi/plugin_list.h" 186 #include "webkit/plugins/npapi/plugin_list.h"
187 #include "webkit/plugins/npapi/webplugin_delegate.h" 187 #include "webkit/plugins/npapi/webplugin_delegate.h"
188 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 188 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
189 #include "webkit/plugins/npapi/webplugin_impl.h" 189 #include "webkit/plugins/npapi/webplugin_impl.h"
190 #include "webkit/plugins/npapi/webview_plugin.h" 190 #include "webkit/plugins/npapi/webview_plugin.h"
191 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 191 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
192 192
193 #if defined(OS_WIN) 193 #if defined(OS_WIN)
194 // TODO(port): these files are currently Windows only because they concern: 194 // TODO(port): these files are currently Windows only because they concern:
195 // * theming 195 // * theming
196 #include "gfx/native_theme_win.h" 196 #include "ui/gfx/native_theme_win.h"
197 #elif defined(USE_X11) 197 #elif defined(USE_X11)
198 #include "gfx/native_theme_linux.h"
199 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h" 198 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h"
199 #include "ui/gfx/native_theme_linux.h"
200 #elif defined(OS_MACOSX) 200 #elif defined(OS_MACOSX)
201 #include "skia/ext/skia_utils_mac.h" 201 #include "skia/ext/skia_utils_mac.h"
202 #endif 202 #endif
203 203
204 using WebKit::WebAccessibilityCache; 204 using WebKit::WebAccessibilityCache;
205 using WebKit::WebAccessibilityNotification; 205 using WebKit::WebAccessibilityNotification;
206 using WebKit::WebAccessibilityObject; 206 using WebKit::WebAccessibilityObject;
207 using WebKit::WebApplicationCacheHost; 207 using WebKit::WebApplicationCacheHost;
208 using WebKit::WebApplicationCacheHostClient; 208 using WebKit::WebApplicationCacheHostClient;
209 using WebKit::WebCString; 209 using WebKit::WebCString;
(...skipping 5520 matching lines...) Expand 10 before | Expand all | Expand 10 after
5730 } 5730 }
5731 } 5731 }
5732 5732
5733 void RenderView::OnContextMenuClosed( 5733 void RenderView::OnContextMenuClosed(
5734 const webkit_glue::CustomContextMenuContext& custom_context) { 5734 const webkit_glue::CustomContextMenuContext& custom_context) {
5735 if (custom_context.is_pepper_menu) 5735 if (custom_context.is_pepper_menu)
5736 pepper_delegate_.OnContextMenuClosed(custom_context); 5736 pepper_delegate_.OnContextMenuClosed(custom_context);
5737 else 5737 else
5738 context_menu_node_.reset(); 5738 context_menu_node_.reset();
5739 } 5739 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_thread.h ('k') | chrome/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698