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

Side by Side Diff: chrome/browser/profile_impl.cc

Issue 3047052: chromeos: 1st draft of ProxyConfigService for chromeos... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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/profile_impl.h ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/profile_impl.h" 5 #include "chrome/browser/profile_impl.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 #if defined(TOOLKIT_USES_GTK) 81 #if defined(TOOLKIT_USES_GTK)
82 #include "chrome/browser/gtk/gtk_theme_provider.h" 82 #include "chrome/browser/gtk/gtk_theme_provider.h"
83 #endif 83 #endif
84 84
85 #if defined(OS_WIN) 85 #if defined(OS_WIN)
86 #include "chrome/browser/password_manager/password_store_win.h" 86 #include "chrome/browser/password_manager/password_store_win.h"
87 #elif defined(OS_MACOSX) 87 #elif defined(OS_MACOSX)
88 #include "chrome/browser/keychain_mac.h" 88 #include "chrome/browser/keychain_mac.h"
89 #include "chrome/browser/password_manager/password_store_mac.h" 89 #include "chrome/browser/password_manager/password_store_mac.h"
90 #elif defined(OS_CHROMEOS)
91 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
90 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) 92 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
91 #include "base/xdg_util.h" 93 #include "base/xdg_util.h"
92 #include "chrome/browser/password_manager/native_backend_gnome_x.h" 94 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
93 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" 95 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
94 #include "chrome/browser/password_manager/password_store_x.h" 96 #include "chrome/browser/password_manager/password_store_x.h"
95 #endif 97 #endif
96 98
97 using base::Time; 99 using base::Time;
98 using base::TimeDelta; 100 using base::TimeDelta;
99 101
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); 1208 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess()));
1207 sync_service_.reset( 1209 sync_service_.reset(
1208 profile_sync_factory_->CreateProfileSyncService()); 1210 profile_sync_factory_->CreateProfileSyncService());
1209 sync_service_->Initialize(); 1211 sync_service_->Initialize();
1210 } 1212 }
1211 1213
1212 void ProfileImpl::InitCloudPrintProxyService() { 1214 void ProfileImpl::InitCloudPrintProxyService() {
1213 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); 1215 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this));
1214 cloud_print_proxy_service_->Initialize(); 1216 cloud_print_proxy_service_->Initialize();
1215 } 1217 }
1218
1219 #if defined(OS_CHROMEOS)
1220 chromeos::ProxyConfigServiceImpl*
1221 ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
1222 if (!chromeos_proxy_config_service_impl_) {
1223 chromeos_proxy_config_service_impl_ =
1224 new chromeos::ProxyConfigServiceImpl();
1225 }
1226 return chromeos_proxy_config_service_impl_;
1227 }
1228 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/profile_impl.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698