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

Side by Side Diff: chrome/browser/android/thumbnail/thumbnail_store.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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/app/signature_validator_win_unittest.cc ('k') | chrome/browser/apps/app_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/android/thumbnail/thumbnail_store.h" 5 #include "chrome/browser/android/thumbnail/thumbnail_store.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/big_endian.h" 10 #include "base/big_endian.h"
11 #include "base/file_util.h"
12 #include "base/files/file.h" 11 #include "base/files/file.h"
13 #include "base/files/file_enumerator.h" 12 #include "base/files/file_enumerator.h"
14 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/files/file_util.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/threading/worker_pool.h" 16 #include "base/threading/worker_pool.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "content/public/browser/android/ui_resource_provider.h" 18 #include "content/public/browser/android/ui_resource_provider.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "third_party/android_opengl/etc1/etc1.h" 20 #include "third_party/android_opengl/etc1/etc1.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
22 #include "third_party/skia/include/core/SkCanvas.h" 22 #include "third_party/skia/include/core/SkCanvas.h"
23 #include "third_party/skia/include/core/SkData.h" 23 #include "third_party/skia/include/core/SkData.h"
24 #include "third_party/skia/include/core/SkMallocPixelRef.h" 24 #include "third_party/skia/include/core/SkMallocPixelRef.h"
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 dst_bitmap.eraseColor(0); 841 dst_bitmap.eraseColor(0);
842 SkAutoLockPixels dst_bitmap_lock(dst_bitmap); 842 SkAutoLockPixels dst_bitmap_lock(dst_bitmap);
843 843
844 SkCanvas canvas(dst_bitmap); 844 SkCanvas canvas(dst_bitmap);
845 canvas.scale(new_scale, new_scale); 845 canvas.scale(new_scale, new_scale);
846 canvas.drawBitmap(bitmap, 0, 0, NULL); 846 canvas.drawBitmap(bitmap, 0, 0, NULL);
847 dst_bitmap.setImmutable(); 847 dst_bitmap.setImmutable();
848 848
849 return std::make_pair(dst_bitmap, new_scale * scale); 849 return std::make_pair(dst_bitmap, new_scale * scale);
850 } 850 }
OLDNEW
« no previous file with comments | « chrome/app/signature_validator_win_unittest.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698