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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
547 DCHECK(found_value->IsType(default_type)); | 547 DCHECK(found_value->IsType(default_type)); |
548 return found_value; | 548 return found_value; |
549 } else { | 549 } else { |
550 // Every registered preference has at least a default value. | 550 // Every registered preference has at least a default value. |
551 NOTREACHED() << "no valid value found for registered pref " << path; | 551 NOTREACHED() << "no valid value found for registered pref " << path; |
552 } | 552 } |
553 } | 553 } |
554 | 554 |
555 return NULL; | 555 return NULL; |
556 } | 556 } |
557 | |
558 scoped_ptr<base::DictionaryValue> PrefService::GetBrowserDictionary() const { | |
559 const base::Value* browser_value = NULL; | |
dgrogan
2014/09/04 00:50:51
The other accessor methods use pref_registry to ge
| |
560 if (!user_pref_store_->GetValue("browser", &browser_value)) | |
561 return scoped_ptr<base::DictionaryValue>(); | |
562 const base::DictionaryValue* browser_dict = NULL; | |
563 if (!browser_value->GetAsDictionary(&browser_dict)) { | |
564 NOTREACHED(); | |
Bernhard Bauer
2014/09/04 11:06:02
Using NOTREACHED() to handle the result of a check
dgrogan
2014/09/04 20:26:32
Removed the NOTREACHED since it is possible that s
| |
565 return scoped_ptr<base::DictionaryValue>(); | |
566 } | |
567 return make_scoped_ptr(browser_dict->DeepCopy()); | |
568 } | |
OLD | NEW |