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

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

Issue 138163015: More fixes to enable ios build with policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed obsolete files from gyp Created 6 years, 11 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 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 488
489 // The state of metrics reporting in the browser that this profile runs on. 489 // The state of metrics reporting in the browser that this profile runs on.
490 // Unfortunately, since ChromeOS has a separate representation of this state, 490 // Unfortunately, since ChromeOS has a separate representation of this state,
491 // we need to make one available based on the platform. 491 // we need to make one available based on the platform.
492 #if defined(OS_CHROMEOS) 492 #if defined(OS_CHROMEOS)
493 bool enable_metrics_; 493 bool enable_metrics_;
494 #else 494 #else
495 BooleanPrefMember enable_metrics_; 495 BooleanPrefMember enable_metrics_;
496 #endif 496 #endif
497 497
498 #if defined(ENABLE_CONFIGURATION_POLICY)
498 // Pointed to by NetworkDelegate. 499 // Pointed to by NetworkDelegate.
499 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; 500 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
500
501 #if defined(ENABLE_CONFIGURATION_POLICY)
502 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_; 501 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_;
503 #endif 502 #endif
504 503
505 // Pointed to by URLRequestContext. 504 // Pointed to by URLRequestContext.
506 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; 505 mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
507 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 506 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
508 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 507 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
509 mutable scoped_ptr<net::FraudulentCertificateReporter> 508 mutable scoped_ptr<net::FraudulentCertificateReporter>
510 fraudulent_certificate_reporter_; 509 fraudulent_certificate_reporter_;
511 mutable scoped_ptr<net::ProxyService> proxy_service_; 510 mutable scoped_ptr<net::ProxyService> proxy_service_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 542
544 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 543 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
545 bool initialized_on_UI_thread_; 544 bool initialized_on_UI_thread_;
546 545
547 bool is_incognito_; 546 bool is_incognito_;
548 547
549 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 548 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
550 }; 549 };
551 550
552 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 551 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698