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

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

Issue 6648002: Make DBUS an optional dependency so Chromium can be built without it.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 9 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/profiles/profile.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 #include "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #include "chrome/browser/keychain_mac.h" 112 #include "chrome/browser/keychain_mac.h"
113 #include "chrome/browser/password_manager/password_store_mac.h" 113 #include "chrome/browser/password_manager/password_store_mac.h"
114 #elif defined(OS_CHROMEOS) 114 #elif defined(OS_CHROMEOS)
115 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 115 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
116 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 116 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
117 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) 117 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
118 #include "base/nix/xdg_util.h" 118 #include "base/nix/xdg_util.h"
119 #if defined(USE_GNOME_KEYRING) 119 #if defined(USE_GNOME_KEYRING)
120 #include "chrome/browser/password_manager/native_backend_gnome_x.h" 120 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
121 #endif 121 #endif
122 #if defined(USE_DBUS)
122 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" 123 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
124 #endif
123 #include "chrome/browser/password_manager/password_store_x.h" 125 #include "chrome/browser/password_manager/password_store_x.h"
124 #endif 126 #endif
125 127
126 #if defined(OS_CHROMEOS) 128 #if defined(OS_CHROMEOS)
127 #include "chrome/browser/chromeos/locale_change_guard.h" 129 #include "chrome/browser/chromeos/locale_change_guard.h"
128 #include "chrome/browser/chromeos/login/user_manager.h" 130 #include "chrome/browser/chromeos/login/user_manager.h"
129 #include "chrome/browser/chromeos/preferences.h" 131 #include "chrome/browser/chromeos/preferences.h"
130 #endif 132 #endif
131 133
132 using base::Time; 134 using base::Time;
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 desktop_env = base::nix::DESKTOP_ENVIRONMENT_OTHER; 1006 desktop_env = base::nix::DESKTOP_ENVIRONMENT_OTHER;
1005 } else { // Detect the store to use automatically. 1007 } else { // Detect the store to use automatically.
1006 scoped_ptr<base::Environment> env(base::Environment::Create()); 1008 scoped_ptr<base::Environment> env(base::Environment::Create());
1007 desktop_env = base::nix::GetDesktopEnvironment(env.get()); 1009 desktop_env = base::nix::GetDesktopEnvironment(env.get());
1008 VLOG(1) << "Password storage detected desktop environment: " 1010 VLOG(1) << "Password storage detected desktop environment: "
1009 << base::nix::GetDesktopEnvironmentName(desktop_env); 1011 << base::nix::GetDesktopEnvironmentName(desktop_env);
1010 } 1012 }
1011 1013
1012 scoped_ptr<PasswordStoreX::NativeBackend> backend; 1014 scoped_ptr<PasswordStoreX::NativeBackend> backend;
1013 if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) { 1015 if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
1016 #if defined(USE_DBUS)
1014 // KDE3 didn't use DBus, which our KWallet store uses. 1017 // KDE3 didn't use DBus, which our KWallet store uses.
1015 VLOG(1) << "Trying KWallet for password storage."; 1018 VLOG(1) << "Trying KWallet for password storage.";
1016 backend.reset(new NativeBackendKWallet()); 1019 backend.reset(new NativeBackendKWallet());
1017 if (backend->Init()) 1020 if (backend->Init())
1018 VLOG(1) << "Using KWallet for password storage."; 1021 VLOG(1) << "Using KWallet for password storage.";
1019 else 1022 else
1020 backend.reset(); 1023 backend.reset();
1024 #endif
1021 } else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME || 1025 } else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
1022 desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) { 1026 desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
1023 #if defined(USE_GNOME_KEYRING) 1027 #if defined(USE_GNOME_KEYRING)
1024 VLOG(1) << "Trying GNOME keyring for password storage."; 1028 VLOG(1) << "Trying GNOME keyring for password storage.";
1025 backend.reset(new NativeBackendGnome()); 1029 backend.reset(new NativeBackendGnome());
1026 if (backend->Init()) 1030 if (backend->Init())
1027 VLOG(1) << "Using GNOME keyring for password storage."; 1031 VLOG(1) << "Using GNOME keyring for password storage.";
1028 else 1032 else
1029 backend.reset(); 1033 backend.reset();
1030 #endif // defined(USE_GNOME_KEYRING) 1034 #endif // defined(USE_GNOME_KEYRING)
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 return pref_proxy_config_tracker_; 1538 return pref_proxy_config_tracker_;
1535 } 1539 }
1536 1540
1537 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1541 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1538 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1542 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1539 return NULL; 1543 return NULL;
1540 if (!prerender_manager_) 1544 if (!prerender_manager_)
1541 prerender_manager_ = new prerender::PrerenderManager(this); 1545 prerender_manager_ = new prerender::PrerenderManager(this);
1542 return prerender_manager_; 1546 return prerender_manager_;
1543 } 1547 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698