| OLD | NEW |
| 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.h" | 5 #include "chrome/browser/profiles/profile.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 146 } |
| 147 | 147 |
| 148 std::string Profile::GetDebugName() { | 148 std::string Profile::GetDebugName() { |
| 149 std::string name = GetPath().BaseName().MaybeAsASCII(); | 149 std::string name = GetPath().BaseName().MaybeAsASCII(); |
| 150 if (name.empty()) { | 150 if (name.empty()) { |
| 151 name = "UnknownProfile"; | 151 name = "UnknownProfile"; |
| 152 } | 152 } |
| 153 return name; | 153 return name; |
| 154 } | 154 } |
| 155 | 155 |
| 156 GURL Profile::ShowingGoodiesPageInNewWindow() { |
| 157 return GURL(); |
| 158 } |
| 159 |
| 156 bool Profile::IsGuestSession() const { | 160 bool Profile::IsGuestSession() const { |
| 157 #if defined(OS_CHROMEOS) | 161 #if defined(OS_CHROMEOS) |
| 158 static bool is_guest_session = | 162 static bool is_guest_session = |
| 159 base::CommandLine::ForCurrentProcess()->HasSwitch( | 163 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 160 chromeos::switches::kGuestSession); | 164 chromeos::switches::kGuestSession); |
| 161 return is_guest_session; | 165 return is_guest_session; |
| 162 #else | 166 #else |
| 163 return is_guest_profile_; | 167 return is_guest_profile_; |
| 164 #endif | 168 #endif |
| 165 } | 169 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 if (a->IsSameProfile(b)) | 209 if (a->IsSameProfile(b)) |
| 206 return false; | 210 return false; |
| 207 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 211 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 208 } | 212 } |
| 209 | 213 |
| 210 double Profile::GetDefaultZoomLevelForProfile() { | 214 double Profile::GetDefaultZoomLevelForProfile() { |
| 211 return GetDefaultStoragePartition(this) | 215 return GetDefaultStoragePartition(this) |
| 212 ->GetHostZoomMap() | 216 ->GetHostZoomMap() |
| 213 ->GetDefaultZoomLevel(); | 217 ->GetDefaultZoomLevel(); |
| 214 } | 218 } |
| OLD | NEW |