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

Side by Side Diff: extensions/common/features/json_feature_provider_source.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/common/features/json_feature_provider_source.h" 5 #include "extensions/common/features/json_feature_provider_source.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h"
11 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
12 13
13 namespace extensions { 14 namespace extensions {
14 15
15 JSONFeatureProviderSource::JSONFeatureProviderSource(const std::string& name) 16 JSONFeatureProviderSource::JSONFeatureProviderSource(const std::string& name)
16 : name_(name) { 17 : name_(name) {
17 } 18 }
18 19
19 JSONFeatureProviderSource::~JSONFeatureProviderSource() { 20 JSONFeatureProviderSource::~JSONFeatureProviderSource() {
20 } 21 }
(...skipping 23 matching lines...) Expand all
44 if (dictionary_.GetWithoutPathExpansion(iter.key(), NULL)) 45 if (dictionary_.GetWithoutPathExpansion(iter.key(), NULL))
45 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_ 46 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_
46 << " JSON feature files more than once."; 47 << " JSON feature files more than once.";
47 } 48 }
48 49
49 // Merge. 50 // Merge.
50 dictionary_.MergeDictionary(value_as_dict.get()); 51 dictionary_.MergeDictionary(value_as_dict.get());
51 } 52 }
52 53
53 } // namespace extensions 54 } // namespace extensions
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/touch_selection_controller_client_aura.h ('k') | ui/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698