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

Side by Side Diff: sql/mojo/mojo_vfs.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « sql/mojo/DEPS ('k') | sql/mojo/sql_test_base.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "sql/mojo/mojo_vfs.h" 5 #include "sql/mojo/mojo_vfs.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "components/filesystem/public/interfaces/file.mojom.h" 11 #include "components/filesystem/public/interfaces/file.mojom.h"
12 #include "components/filesystem/public/interfaces/file_system.mojom.h" 12 #include "components/filesystem/public/interfaces/file_system.mojom.h"
13 #include "components/filesystem/public/interfaces/types.mojom.h" 13 #include "components/filesystem/public/interfaces/types.mojom.h"
14 #include "mojo/public/cpp/bindings/lib/template_util.h"
14 #include "mojo/util/capture_util.h" 15 #include "mojo/util/capture_util.h"
15 #include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h"
16 #include "third_party/sqlite/sqlite3.h" 16 #include "third_party/sqlite/sqlite3.h"
17 17
18 using mojo::Capture; 18 using mojo::Capture;
19 19
20 namespace sql { 20 namespace sql {
21 21
22 sqlite3_vfs* GetParentVFS(sqlite3_vfs* mojo_vfs) { 22 sqlite3_vfs* GetParentVFS(sqlite3_vfs* mojo_vfs) {
23 return static_cast<ScopedMojoFilesystemVFS*>(mojo_vfs->pAppData)->parent_; 23 return static_cast<ScopedMojoFilesystemVFS*>(mojo_vfs->pAppData)->parent_;
24 } 24 }
25 25
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 CHECK(sqlite3_vfs_register(parent_, 1) == SQLITE_OK); 443 CHECK(sqlite3_vfs_register(parent_, 1) == SQLITE_OK);
444 CHECK(sqlite3_vfs_unregister(&mojo_vfs) == SQLITE_OK); 444 CHECK(sqlite3_vfs_unregister(&mojo_vfs) == SQLITE_OK);
445 } 445 }
446 446
447 filesystem::DirectoryPtr& ScopedMojoFilesystemVFS::GetDirectory() { 447 filesystem::DirectoryPtr& ScopedMojoFilesystemVFS::GetDirectory() {
448 return root_directory_; 448 return root_directory_;
449 } 449 }
450 450
451 } // namespace sql 451 } // namespace sql
OLDNEW
« no previous file with comments | « sql/mojo/DEPS ('k') | sql/mojo/sql_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698