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

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

Issue 7576009: Merge 95232 - WebSocket: Remove obsolete experiments related files (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/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/browser_main.cc ('k') | chrome/chrome_browser.gypi » ('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
11 #include <string> 11 #include <string>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "chrome/browser/net/preconnect.h" // TODO: remove this. 15 #include "chrome/browser/net/preconnect.h" // TODO: remove this.
16 #include "chrome/common/extensions/extension.h" 16 #include "chrome/common/extensions/extension.h"
17 17
18 namespace base { 18 namespace base {
19 class Time; 19 class Time;
20 } 20 }
21 21
22 namespace chrome_browser_net_websocket_experiment {
23 class WebSocketExperimentTask;
24 }
25
26 namespace chromeos { 22 namespace chromeos {
27 class LibCrosServiceLibraryImpl; 23 class LibCrosServiceLibraryImpl;
28 class ResetDefaultProxyConfigServiceTask; 24 class ResetDefaultProxyConfigServiceTask;
29 } 25 }
30 26
31 namespace content { 27 namespace content {
32 class ResourceContext; 28 class ResourceContext;
33 } 29 }
34 30
35 namespace fileapi { 31 namespace fileapi {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 friend class DefaultGeolocationArbitratorDependencyFactory; 168 friend class DefaultGeolocationArbitratorDependencyFactory;
173 friend class DevToolsHttpProtocolHandler; 169 friend class DevToolsHttpProtocolHandler;
174 friend class DevToolsUI; 170 friend class DevToolsUI;
175 friend class LiveSyncTest; 171 friend class LiveSyncTest;
176 friend class MetricsService; 172 friend class MetricsService;
177 friend class ResolveProxyMsgHelper; 173 friend class ResolveProxyMsgHelper;
178 friend class SafeBrowsingServiceTestHelper; 174 friend class SafeBrowsingServiceTestHelper;
179 friend class SdchDictionaryFetcher; 175 friend class SdchDictionaryFetcher;
180 friend class Toolbar5Importer; 176 friend class Toolbar5Importer;
181 friend class TranslateManager; 177 friend class TranslateManager;
182 friend class
183 chrome_browser_net_websocket_experiment::WebSocketExperimentTask;
184 friend class chromeos::LibCrosServiceLibraryImpl; 178 friend class chromeos::LibCrosServiceLibraryImpl;
185 friend class chromeos::ResetDefaultProxyConfigServiceTask; 179 friend class chromeos::ResetDefaultProxyConfigServiceTask;
186 friend class speech_input::SpeechRecognizer; 180 friend class speech_input::SpeechRecognizer;
187 181
188 static net::URLRequestContextGetter* GetDefaultRequestContext() { 182 static net::URLRequestContextGetter* GetDefaultRequestContext() {
189 return Profile::GetDefaultRequestContext(); 183 return Profile::GetDefaultRequestContext();
190 } 184 }
191 }; 185 };
192 186
193 // Key used to bind profile to the widget with which it is associated. 187 // Key used to bind profile to the widget with which it is associated.
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 struct hash<Profile*> { 640 struct hash<Profile*> {
647 std::size_t operator()(Profile* const& p) const { 641 std::size_t operator()(Profile* const& p) const {
648 return reinterpret_cast<std::size_t>(p); 642 return reinterpret_cast<std::size_t>(p);
649 } 643 }
650 }; 644 };
651 645
652 } // namespace __gnu_cxx 646 } // namespace __gnu_cxx
653 #endif 647 #endif
654 648
655 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_ 649 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698