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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_store.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: ps Created 3 years, 6 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 (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/extensions/api/content_settings/content_settings_store. h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h" 17 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h"
18 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h" 18 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h"
19 #include "components/content_settings/core/browser/content_settings_origin_ident ifier_value_map.h" 19 #include "components/content_settings/core/browser/content_settings_origin_ident ifier_value_map.h"
20 #include "components/content_settings/core/browser/content_settings_rule.h" 20 #include "components/content_settings/core/browser/content_settings_rule.h"
21 #include "components/content_settings/core/browser/content_settings_utils.h" 21 #include "components/content_settings/core/browser/content_settings_utils.h"
22 #include "components/content_settings/core/common/content_settings_utils.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 24
24 using content::BrowserThread; 25 using content::BrowserThread;
25 using content_settings::ConcatenationIterator; 26 using content_settings::ConcatenationIterator;
26 using content_settings::Rule; 27 using content_settings::Rule;
27 using content_settings::RuleIterator; 28 using content_settings::RuleIterator;
28 using content_settings::OriginIdentifierValueMap; 29 using content_settings::OriginIdentifierValueMap;
29 using content_settings::ResourceIdentifier; 30 using content_settings::ResourceIdentifier;
30 using content_settings::ValueToContentSetting; 31 using content_settings::ValueToContentSetting;
31 32
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 385
385 ContentSettingsStore::ExtensionEntries::iterator 386 ContentSettingsStore::ExtensionEntries::iterator
386 ContentSettingsStore::FindIterator(const std::string& ext_id) { 387 ContentSettingsStore::FindIterator(const std::string& ext_id) {
387 return std::find_if(entries_.begin(), entries_.end(), 388 return std::find_if(entries_.begin(), entries_.end(),
388 [ext_id](const std::unique_ptr<ExtensionEntry>& entry) { 389 [ext_id](const std::unique_ptr<ExtensionEntry>& entry) {
389 return entry->id == ext_id; 390 return entry->id == ext_id;
390 }); 391 });
391 } 392 }
392 393
393 } // namespace extensions 394 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698