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

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

Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix dcheck Created 8 years, 9 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
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_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 public: 212 public:
213 explicit ResourceContext(ProfileIOData* io_data); 213 explicit ResourceContext(ProfileIOData* io_data);
214 virtual ~ResourceContext(); 214 virtual ~ResourceContext();
215 215
216 private: 216 private:
217 friend class ProfileIOData; 217 friend class ProfileIOData;
218 218
219 // ResourceContext implementation: 219 // ResourceContext implementation:
220 virtual net::HostResolver* GetHostResolver() OVERRIDE; 220 virtual net::HostResolver* GetHostResolver() OVERRIDE;
221 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 221 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
222 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
223
224 void EnsureInitialized(); 222 void EnsureInitialized();
225 223
226 ProfileIOData* const io_data_; 224 ProfileIOData* const io_data_;
227 225
228 net::HostResolver* host_resolver_; 226 net::HostResolver* host_resolver_;
229 net::URLRequestContext* request_context_; 227 net::URLRequestContext* request_context_;
230 content::MediaObserver* media_observer_;
231 }; 228 };
232 229
233 typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> > 230 typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
234 AppRequestContextMap; 231 AppRequestContextMap;
235 232
236 // -------------------------------------------- 233 // --------------------------------------------
237 // Virtual interface for subtypes to implement: 234 // Virtual interface for subtypes to implement:
238 // -------------------------------------------- 235 // --------------------------------------------
239 236
240 // Does the actual initialization of the ProfileIOData subtype. Subtypes 237 // Does the actual initialization of the ProfileIOData subtype. Subtypes
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // One AppRequestContext per isolated app. 303 // One AppRequestContext per isolated app.
307 mutable AppRequestContextMap app_request_context_map_; 304 mutable AppRequestContextMap app_request_context_map_;
308 305
309 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 306 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
310 bool initialized_on_UI_thread_; 307 bool initialized_on_UI_thread_;
311 308
312 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 309 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
313 }; 310 };
314 311
315 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 312 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/media_internals_unittest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698