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

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

Issue 113710: Patch to make password patch build. (Closed)
Patch Set: Created 11 years, 7 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
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/chrome.gyp » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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.h" 5 #include "chrome/browser/profile.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 Profile* Profile::CreateProfile(const FilePath& path) { 83 Profile* Profile::CreateProfile(const FilePath& path) {
84 return new ProfileImpl(path); 84 return new ProfileImpl(path);
85 } 85 }
86 86
87 // static 87 // static
88 URLRequestContext* Profile::GetDefaultRequestContext() { 88 URLRequestContext* Profile::GetDefaultRequestContext() {
89 return default_request_context_; 89 return default_request_context_;
90 } 90 }
91 91
92 #if defined(OS_LINUX) 92 #if defined(OS_LINUX)
93 #include "chrome/browser/password_manager/password_store_gnome.h" 93 // Temporarily disabled while we figure some stuff out.
94 #include "chrome/browser/password_manager/password_store_kwallet.h" 94 // http://code.google.com/p/chromium/issues/detail?id=12351
95 // #include "chrome/browser/password_manager/password_store_gnome.h"
96 // #include "chrome/browser/password_manager/password_store_kwallet.h"
95 #elif defined(OS_WIN) 97 #elif defined(OS_WIN)
96 #include "chrome/browser/password_manager/password_store_win.h" 98 #include "chrome/browser/password_manager/password_store_win.h"
97 #endif 99 #endif
98 100
99 //////////////////////////////////////////////////////////////////////////////// 101 ////////////////////////////////////////////////////////////////////////////////
100 // 102 //
101 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile 103 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile
102 // to make it suitable for the off the record mode. 104 // to make it suitable for the off the record mode.
103 // 105 //
104 //////////////////////////////////////////////////////////////////////////////// 106 ////////////////////////////////////////////////////////////////////////////////
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 if (!created_password_store_) 813 if (!created_password_store_)
812 CreatePasswordStore(); 814 CreatePasswordStore();
813 return password_store_.get(); 815 return password_store_.get();
814 } 816 }
815 817
816 void ProfileImpl::CreatePasswordStore() { 818 void ProfileImpl::CreatePasswordStore() {
817 DCHECK(!created_password_store_ && password_store_.get() == NULL); 819 DCHECK(!created_password_store_ && password_store_.get() == NULL);
818 created_password_store_ = true; 820 created_password_store_ = true;
819 scoped_refptr<PasswordStore> ps; 821 scoped_refptr<PasswordStore> ps;
820 #if defined(OS_LINUX) 822 #if defined(OS_LINUX)
821 if (getenv("KDE_FULL_SESSION")) { 823 // Temporarily disabled while we figure some stuff out.
822 ps = new PasswordStoreKWallet(); 824 // http://code.google.com/p/chromium/issues/detail?id=12351
823 } else { 825 // if (getenv("KDE_FULL_SESSION")) {
824 ps = new PasswordStoreGnome(); 826 // ps = new PasswordStoreKWallet();
825 } 827 // } else {
828 // ps = new PasswordStoreGnome();
829 // }
830 NOTIMPLEMENTED();
826 #elif defined(OS_WIN) 831 #elif defined(OS_WIN)
827 ps = new PasswordStoreWin(GetWebDataService(Profile::IMPLICIT_ACCESS)); 832 ps = new PasswordStoreWin(GetWebDataService(Profile::IMPLICIT_ACCESS));
828 #else 833 #else
829 NOTIMPLEMENTED(); 834 NOTIMPLEMENTED();
830 #endif 835 #endif
831 if (!ps || !ps->Init()) { 836 if (!ps || !ps->Init()) {
832 // Try falling back to the default password manager 837 // Try falling back to the default password manager
833 LOG(WARNING) << "Could not initialise native password manager - " 838 LOG(WARNING) << "Could not initialise native password manager - "
834 "falling back to default"; 839 "falling back to default";
835 ps = new PasswordStoreDefault(GetWebDataService(Profile::IMPLICIT_ACCESS)); 840 ps = new PasswordStoreDefault(GetWebDataService(Profile::IMPLICIT_ACCESS));
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 1070
1066 void ProfileImpl::StopCreateSessionServiceTimer() { 1071 void ProfileImpl::StopCreateSessionServiceTimer() {
1067 create_session_service_timer_.Stop(); 1072 create_session_service_timer_.Stop();
1068 } 1073 }
1069 1074
1070 #ifdef CHROME_PERSONALIZATION 1075 #ifdef CHROME_PERSONALIZATION
1071 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { 1076 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
1072 return personalization_.get(); 1077 return personalization_.get();
1073 } 1078 }
1074 #endif 1079 #endif
OLDNEW
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698