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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.h

Issue 653583002: fix newly added OVERRIDE in profile_impl_io_data.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 isolated_media_request_context_getter_map_; 142 isolated_media_request_context_getter_map_;
143 ProfileImplIOData* const io_data_; 143 ProfileImplIOData* const io_data_;
144 144
145 Profile* const profile_; 145 Profile* const profile_;
146 146
147 mutable bool initialized_; 147 mutable bool initialized_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(Handle); 149 DISALLOW_COPY_AND_ASSIGN(Handle);
150 }; 150 };
151 151
152 virtual bool IsDataReductionProxyEnabled() const OVERRIDE; 152 virtual bool IsDataReductionProxyEnabled() const override;
153 153
154 BooleanPrefMember* data_reduction_proxy_enabled() const { 154 BooleanPrefMember* data_reduction_proxy_enabled() const {
155 return &data_reduction_proxy_enabled_; 155 return &data_reduction_proxy_enabled_;
156 } 156 }
157 157
158 private: 158 private:
159 friend class base::RefCountedThreadSafe<ProfileImplIOData>; 159 friend class base::RefCountedThreadSafe<ProfileImplIOData>;
160 160
161 struct LazyParams { 161 struct LazyParams {
162 LazyParams(); 162 LazyParams();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 // Parameters needed for isolated apps. 246 // Parameters needed for isolated apps.
247 base::FilePath profile_path_; 247 base::FilePath profile_path_;
248 int app_cache_max_size_; 248 int app_cache_max_size_;
249 int app_media_cache_max_size_; 249 int app_media_cache_max_size_;
250 250
251 DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData); 251 DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData);
252 }; 252 };
253 253
254 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_ 254 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698