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

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

Issue 7688006: Revert 97465 - Revert 97446 - Modifying prefetch to account for multi-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_H_
9 #pragma once 9 #pragma once
10 10
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 namespace prerender { 43 namespace prerender {
44 class PrerenderManager; 44 class PrerenderManager;
45 } 45 }
46 46
47 namespace speech_input { 47 namespace speech_input {
48 class SpeechRecognizer; 48 class SpeechRecognizer;
49 } 49 }
50 50
51 namespace chrome_browser_net {
52 class Predictor;
53 }
54
51 class AutocompleteClassifier; 55 class AutocompleteClassifier;
52 class BookmarkModel; 56 class BookmarkModel;
53 class BrowserSignin; 57 class BrowserSignin;
54 class ChromeAppCacheService; 58 class ChromeAppCacheService;
55 class ChromeURLDataManager; 59 class ChromeURLDataManager;
56 class Extension; 60 class Extension;
57 class ExtensionDevToolsManager; 61 class ExtensionDevToolsManager;
58 class ExtensionEventRouter; 62 class ExtensionEventRouter;
59 class ExtensionInfoMap; 63 class ExtensionInfoMap;
60 class ExtensionMessageService; 64 class ExtensionMessageService;
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 return 0 == accessibility_pause_level_; 548 return 0 == accessibility_pause_level_;
545 } 549 }
546 550
547 // Checks whether sync is configurable by the user. Returns false if sync is 551 // Checks whether sync is configurable by the user. Returns false if sync is
548 // disabled or controlled by configuration management. 552 // disabled or controlled by configuration management.
549 bool IsSyncAccessible(); 553 bool IsSyncAccessible();
550 554
551 // Creates an OffTheRecordProfile which points to this Profile. 555 // Creates an OffTheRecordProfile which points to this Profile.
552 Profile* CreateOffTheRecordProfile(); 556 Profile* CreateOffTheRecordProfile();
553 557
558 virtual chrome_browser_net::Predictor* GetNetworkPredictor();
559
554 protected: 560 protected:
555 friend class OffTheRecordProfileImpl; 561 friend class OffTheRecordProfileImpl;
556 562
557 static net::URLRequestContextGetter* default_request_context_; 563 static net::URLRequestContextGetter* default_request_context_;
558 564
559 private: 565 private:
560 // ***DEPRECATED**: You should be passing in the specific profile's 566 // ***DEPRECATED**: You should be passing in the specific profile's
561 // URLRequestContextGetter or using the system URLRequestContextGetter. 567 // URLRequestContextGetter or using the system URLRequestContextGetter.
562 // 568 //
563 // Returns the request context for the "default" profile. This may be called 569 // Returns the request context for the "default" profile. This may be called
(...skipping 21 matching lines...) Expand all
585 struct hash<Profile*> { 591 struct hash<Profile*> {
586 std::size_t operator()(Profile* const& p) const { 592 std::size_t operator()(Profile* const& p) const {
587 return reinterpret_cast<std::size_t>(p); 593 return reinterpret_cast<std::size_t>(p);
588 } 594 }
589 }; 595 };
590 596
591 } // namespace __gnu_cxx 597 } // namespace __gnu_cxx
592 #endif 598 #endif
593 599
594 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_ 600 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698