OLD | NEW |
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.h" | 5 #include "chrome/browser/profiles/profile.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" | 54 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" |
55 #endif | 55 #endif |
56 | 56 |
57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
58 #include "chrome/browser/password_manager/password_store_win.h" | 58 #include "chrome/browser/password_manager/password_store_win.h" |
59 #elif defined(OS_MACOSX) | 59 #elif defined(OS_MACOSX) |
60 #include "chrome/browser/keychain_mac.h" | 60 #include "chrome/browser/keychain_mac.h" |
61 #include "chrome/browser/password_manager/password_store_mac.h" | 61 #include "chrome/browser/password_manager/password_store_mac.h" |
62 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) | 62 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) |
63 #include "chrome/browser/password_manager/native_backend_gnome_x.h" | 63 #include "chrome/browser/password_manager/native_backend_gnome_x.h" |
| 64 #if defined(USE_DBUS) |
64 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" | 65 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" |
| 66 #endif |
65 #include "chrome/browser/password_manager/password_store_x.h" | 67 #include "chrome/browser/password_manager/password_store_x.h" |
66 #elif defined(OS_CHROMEOS) | 68 #elif defined(OS_CHROMEOS) |
67 #include "chrome/browser/chromeos/preferences.h" | 69 #include "chrome/browser/chromeos/preferences.h" |
68 #endif | 70 #endif |
69 | 71 |
70 using base::Time; | 72 using base::Time; |
71 using base::TimeDelta; | 73 using base::TimeDelta; |
72 | 74 |
73 // A pointer to the request context for the default profile. See comments on | 75 // A pointer to the request context for the default profile. See comments on |
74 // Profile::GetDefaultRequestContext. | 76 // Profile::GetDefaultRequestContext. |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 }; | 773 }; |
772 #endif | 774 #endif |
773 | 775 |
774 Profile* Profile::CreateOffTheRecordProfile() { | 776 Profile* Profile::CreateOffTheRecordProfile() { |
775 #if defined(OS_CHROMEOS) | 777 #if defined(OS_CHROMEOS) |
776 if (Profile::IsGuestSession()) | 778 if (Profile::IsGuestSession()) |
777 return new GuestSessionProfile(this); | 779 return new GuestSessionProfile(this); |
778 #endif | 780 #endif |
779 return new OffTheRecordProfileImpl(this); | 781 return new OffTheRecordProfileImpl(this); |
780 } | 782 } |
OLD | NEW |