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

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 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
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 #include "chrome/browser/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "net/cookies/cookie_monster.h" 58 #include "net/cookies/cookie_monster.h"
59 #include "net/http/http_transaction_factory.h" 59 #include "net/http/http_transaction_factory.h"
60 #include "net/http/http_util.h" 60 #include "net/http/http_util.h"
61 #include "net/proxy/proxy_config_service_fixed.h" 61 #include "net/proxy/proxy_config_service_fixed.h"
62 #include "net/proxy/proxy_script_fetcher_impl.h" 62 #include "net/proxy/proxy_script_fetcher_impl.h"
63 #include "net/proxy/proxy_service.h" 63 #include "net/proxy/proxy_service.h"
64 #include "net/url_request/data_protocol_handler.h" 64 #include "net/url_request/data_protocol_handler.h"
65 #include "net/url_request/url_request.h" 65 #include "net/url_request/url_request.h"
66 66
67 #if defined(OS_CHROMEOS) 67 #if defined(OS_CHROMEOS)
68 #include "chrome/browser/chromeos/cros_settings.h"
69 #include "chrome/browser/chromeos/cros_settings_names.h"
70 #include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h" 68 #include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h"
71 #include "chrome/browser/chromeos/gview_request_interceptor.h" 69 #include "chrome/browser/chromeos/gview_request_interceptor.h"
72 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 70 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
71 #include "chrome/browser/chromeos/settings/cros_settings.h"
72 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
73 #endif // defined(OS_CHROMEOS) 73 #endif // defined(OS_CHROMEOS)
74 74
75 using content::BrowserContext; 75 using content::BrowserContext;
76 using content::BrowserThread; 76 using content::BrowserThread;
77 using content::ResourceContext; 77 using content::ResourceContext;
78 78
79 namespace { 79 namespace {
80 80
81 // ---------------------------------------------------------------------------- 81 // ----------------------------------------------------------------------------
82 // CookieMonster::Delegate implementation 82 // CookieMonster::Delegate implementation
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 } 599 }
600 600
601 void ProfileIOData::set_server_bound_cert_service( 601 void ProfileIOData::set_server_bound_cert_service(
602 net::ServerBoundCertService* server_bound_cert_service) const { 602 net::ServerBoundCertService* server_bound_cert_service) const {
603 server_bound_cert_service_.reset(server_bound_cert_service); 603 server_bound_cert_service_.reset(server_bound_cert_service);
604 } 604 }
605 605
606 void ProfileIOData::DestroyResourceContext() { 606 void ProfileIOData::DestroyResourceContext() {
607 resource_context_.reset(); 607 resource_context_.reset();
608 } 608 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698