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

Side by Side Diff: components/resource_provider/public/cpp/resource_loader.h

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
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 #ifndef COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_ 5 #ifndef COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_
6 #define COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_ 6 #define COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 15 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
16 #include "mojo/platform_handle/platform_handle.h" 16 #include "mojo/platform_handle/platform_handle.h"
17 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" 17 #include "mojo/public/cpp/bindings/array.h"
18 #include "third_party/mojo/src/mojo/public/cpp/system/handle.h" 18 #include "mojo/public/cpp/system/handle.h"
19 19
20 namespace base { 20 namespace base {
21 class File; 21 class File;
22 } 22 }
23 23
24 namespace mojo { 24 namespace mojo {
25 class ApplicationImpl; 25 class ApplicationImpl;
26 } 26 }
27 27
28 namespace resource_provider { 28 namespace resource_provider {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 bool loaded_; 65 bool loaded_;
66 bool did_block_; 66 bool did_block_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); 68 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
69 }; 69 };
70 70
71 } // namespace resource_provider 71 } // namespace resource_provider
72 72
73 #endif // COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_ 73 #endif // COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698