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

Side by Side Diff: content/child/fileapi/webfilesystem_impl.cc

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/child/fileapi/webfilesystem_impl.h" 5 #include "content/child/fileapi/webfilesystem_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "base/threading/thread_local.h" 13 #include "base/threading/thread_local.h"
14 #include "content/child/child_thread_impl.h" 14 #include "content/child/child_thread_impl.h"
15 #include "content/child/file_info_util.h" 15 #include "content/child/file_info_util.h"
16 #include "content/child/fileapi/file_system_dispatcher.h" 16 #include "content/child/fileapi/file_system_dispatcher.h"
17 #include "content/child/fileapi/webfilewriter_impl.h" 17 #include "content/child/fileapi/webfilewriter_impl.h"
18 #include "content/common/fileapi/file_system_messages.h" 18 #include "content/common/fileapi/file_system_messages.h"
19 #include "storage/common/fileapi/directory_entry.h" 19 #include "storage/common/fileapi/directory_entry.h"
20 #include "storage/common/fileapi/file_system_util.h" 20 #include "storage/common/fileapi/file_system_util.h"
21 #include "third_party/WebKit/public/platform/WebFileInfo.h" 21 #include "third_party/WebKit/public/platform/WebFileInfo.h"
22 #include "third_party/WebKit/public/platform/WebFileSystemCallbacks.h" 22 #include "third_party/WebKit/public/platform/WebFileSystemCallbacks.h"
23 #include "third_party/WebKit/public/platform/WebString.h" 23 #include "third_party/WebKit/public/platform/WebString.h"
24 #include "third_party/WebKit/public/platform/WebURL.h" 24 #include "third_party/WebKit/public/platform/WebURL.h"
25 #include "third_party/WebKit/public/web/WebHeap.h" 25 #include "third_party/WebKit/public/web/WebHeap.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 using base::MakeTuple;
28 using blink::WebFileInfo; 29 using blink::WebFileInfo;
29 using blink::WebFileSystemCallbacks; 30 using blink::WebFileSystemCallbacks;
30 using blink::WebFileSystemEntry; 31 using blink::WebFileSystemEntry;
31 using blink::WebString; 32 using blink::WebString;
32 using blink::WebURL; 33 using blink::WebURL;
33 using blink::WebVector; 34 using blink::WebVector;
34 35
35 namespace content { 36 namespace content {
36 37
37 class WebFileSystemImpl::WaitableCallbackResults 38 class WebFileSystemImpl::WaitableCallbackResults
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 WaitableCallbackResults* WebFileSystemImpl::MaybeCreateWaitableResults( 697 WaitableCallbackResults* WebFileSystemImpl::MaybeCreateWaitableResults(
697 const WebFileSystemCallbacks& callbacks, int callbacks_id) { 698 const WebFileSystemCallbacks& callbacks, int callbacks_id) {
698 if (!callbacks.shouldBlockUntilCompletion()) 699 if (!callbacks.shouldBlockUntilCompletion())
699 return NULL; 700 return NULL;
700 WaitableCallbackResults* results = new WaitableCallbackResults(); 701 WaitableCallbackResults* results = new WaitableCallbackResults();
701 waitable_results_[callbacks_id] = results; 702 waitable_results_[callbacks_id] = results;
702 return results; 703 return results;
703 } 704 }
704 705
705 } // namespace content 706 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura_browsertest.cc ('k') | content/child/resource_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698