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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 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
« no previous file with comments | « content/renderer/pepper/ppb_scrollbar_impl.h ('k') | content/renderer/render_widget.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" 177 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
178 #include "third_party/WebKit/public/web/WebView.h" 178 #include "third_party/WebKit/public/web/WebView.h"
179 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 179 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
180 #include "third_party/WebKit/public/web/default/WebRenderTheme.h" 180 #include "third_party/WebKit/public/web/default/WebRenderTheme.h"
181 #include "third_party/icu/source/common/unicode/uchar.h" 181 #include "third_party/icu/source/common/unicode/uchar.h"
182 #include "third_party/icu/source/common/unicode/uscript.h" 182 #include "third_party/icu/source/common/unicode/uscript.h"
183 #include "ui/base/clipboard/clipboard.h" 183 #include "ui/base/clipboard/clipboard.h"
184 #include "ui/base/ui_base_switches_util.h" 184 #include "ui/base/ui_base_switches_util.h"
185 #include "ui/events/latency_info.h" 185 #include "ui/events/latency_info.h"
186 #include "ui/gfx/geometry/point.h" 186 #include "ui/gfx/geometry/point.h"
187 #include "ui/gfx/geometry/rect.h"
188 #include "ui/gfx/geometry/rect_conversions.h"
187 #include "ui/gfx/native_widget_types.h" 189 #include "ui/gfx/native_widget_types.h"
188 #include "ui/gfx/rect.h"
189 #include "ui/gfx/rect_conversions.h"
190 #include "ui/gfx/size_conversions.h" 190 #include "ui/gfx/size_conversions.h"
191 #include "v8/include/v8.h" 191 #include "v8/include/v8.h"
192 192
193 #if defined(OS_ANDROID) 193 #if defined(OS_ANDROID)
194 #include <cpu-features.h> 194 #include <cpu-features.h>
195 195
196 #include "content/renderer/android/address_detector.h" 196 #include "content/renderer/android/address_detector.h"
197 #include "content/renderer/android/content_detector.h" 197 #include "content/renderer/android/content_detector.h"
198 #include "content/renderer/android/email_detector.h" 198 #include "content/renderer/android/email_detector.h"
199 #include "content/renderer/android/phone_number_detector.h" 199 #include "content/renderer/android/phone_number_detector.h"
200 #include "net/android/network_library.h" 200 #include "net/android/network_library.h"
201 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 201 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
202 #include "third_party/WebKit/public/platform/WebFloatRect.h" 202 #include "third_party/WebKit/public/platform/WebFloatRect.h"
203 #include "ui/gfx/rect_f.h" 203 #include "ui/gfx/geometry/rect_f.h"
204 204
205 #elif defined(OS_WIN) 205 #elif defined(OS_WIN)
206 // TODO(port): these files are currently Windows only because they concern: 206 // TODO(port): these files are currently Windows only because they concern:
207 // * theming 207 // * theming
208 #include "ui/native_theme/native_theme_win.h" 208 #include "ui/native_theme/native_theme_win.h"
209 #elif defined(USE_X11) 209 #elif defined(USE_X11)
210 #include "ui/native_theme/native_theme.h" 210 #include "ui/native_theme/native_theme.h"
211 #elif defined(OS_MACOSX) 211 #elif defined(OS_MACOSX)
212 #include "skia/ext/skia_utils_mac.h" 212 #include "skia/ext/skia_utils_mac.h"
213 #endif 213 #endif
(...skipping 3883 matching lines...) Expand 10 before | Expand all | Expand 10 after
4097 std::vector<gfx::Size> sizes; 4097 std::vector<gfx::Size> sizes;
4098 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4098 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4099 if (!url.isEmpty()) 4099 if (!url.isEmpty())
4100 urls.push_back( 4100 urls.push_back(
4101 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4101 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4102 } 4102 }
4103 SendUpdateFaviconURL(urls); 4103 SendUpdateFaviconURL(urls);
4104 } 4104 }
4105 4105
4106 } // namespace content 4106 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/ppb_scrollbar_impl.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698