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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 12 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
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/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include <stddef.h>
8 #include <stdint.h>
9
7 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
8 #include "base/command_line.h" 11 #include "base/command_line.h"
9 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "build/build_config.h"
11 #include "content/browser/browser_plugin/browser_plugin_guest.h" 16 #include "content/browser/browser_plugin/browser_plugin_guest.h"
12 #include "content/browser/download/drag_download_util.h" 17 #include "content/browser/download/drag_download_util.h"
13 #include "content/browser/frame_host/interstitial_page_impl.h" 18 #include "content/browser/frame_host/interstitial_page_impl.h"
14 #include "content/browser/frame_host/navigation_entry_impl.h" 19 #include "content/browser/frame_host/navigation_entry_impl.h"
15 #include "content/browser/renderer_host/dip_util.h" 20 #include "content/browser/renderer_host/dip_util.h"
16 #include "content/browser/renderer_host/input/touch_selection_controller_client_ aura.h" 21 #include "content/browser/renderer_host/input/touch_selection_controller_client_ aura.h"
17 #include "content/browser/renderer_host/overscroll_controller.h" 22 #include "content/browser/renderer_host/overscroll_controller.h"
18 #include "content/browser/renderer_host/render_view_host_factory.h" 23 #include "content/browser/renderer_host/render_view_host_factory.h"
19 #include "content/browser/renderer_host/render_view_host_impl.h" 24 #include "content/browser/renderer_host/render_view_host_impl.h"
20 #include "content/browser/renderer_host/render_widget_host_impl.h" 25 #include "content/browser/renderer_host/render_widget_host_impl.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 std::vector<DropData::FileSystemFileInfo>* file_system_files) { 249 std::vector<DropData::FileSystemFileInfo>* file_system_files) {
245 base::PickleIterator iter(pickle); 250 base::PickleIterator iter(pickle);
246 251
247 size_t num_files = 0; 252 size_t num_files = 0;
248 if (!iter.ReadSizeT(&num_files)) 253 if (!iter.ReadSizeT(&num_files))
249 return false; 254 return false;
250 file_system_files->resize(num_files); 255 file_system_files->resize(num_files);
251 256
252 for (size_t i = 0; i < num_files; ++i) { 257 for (size_t i = 0; i < num_files; ++i) {
253 std::string url_string; 258 std::string url_string;
254 int64 size = 0; 259 int64_t size = 0;
255 if (!iter.ReadString(&url_string) || !iter.ReadInt64(&size)) 260 if (!iter.ReadString(&url_string) || !iter.ReadInt64(&size))
256 return false; 261 return false;
257 262
258 GURL url(url_string); 263 GURL url(url_string);
259 if (!url.is_valid()) 264 if (!url.is_valid())
260 return false; 265 return false;
261 266
262 (*file_system_files)[i].url = url; 267 (*file_system_files)[i].url = url;
263 (*file_system_files)[i].size = size; 268 (*file_system_files)[i].size = size;
264 } 269 }
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1316 if (visible) { 1321 if (visible) {
1317 if (!web_contents_->should_normally_be_visible()) 1322 if (!web_contents_->should_normally_be_visible())
1318 web_contents_->WasShown(); 1323 web_contents_->WasShown();
1319 } else { 1324 } else {
1320 if (web_contents_->should_normally_be_visible()) 1325 if (web_contents_->should_normally_be_visible())
1321 web_contents_->WasHidden(); 1326 web_contents_->WasHidden();
1322 } 1327 }
1323 } 1328 }
1324 1329
1325 } // namespace content 1330 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698