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

Side by Side Diff: chrome/browser/extensions/extension_content_settings_store.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
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/extensions/extension_content_settings_store.h" 5 #include "chrome/browser/extensions/extension_content_settings_store.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/extension_content_settings_api_constants.h" 12 #include "chrome/browser/extensions/extension_content_settings_api_constants.h"
13 #include "chrome/browser/extensions/extension_content_settings_helpers.h" 13 #include "chrome/browser/extensions/extension_content_settings_helpers.h"
14 #include "content/browser/browser_thread.h" 14 #include "content/browser/browser_thread.h"
15 15
16 namespace helpers = extension_content_settings_helpers; 16 namespace helpers = extension_content_settings_helpers;
17 namespace keys = extension_content_settings_api_constants; 17 namespace keys = extension_content_settings_api_constants;
18 18
19 namespace { 19 namespace {
20 20
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 ExtensionContentSettingsStore::Observer, 439 ExtensionContentSettingsStore::Observer,
440 observers_, 440 observers_,
441 OnContentSettingChanged(extension_id, incognito)); 441 OnContentSettingChanged(extension_id, incognito));
442 } 442 }
443 443
444 bool ExtensionContentSettingsStore::OnCorrectThread() { 444 bool ExtensionContentSettingsStore::OnCorrectThread() {
445 // If there is no UI thread, we're most likely in a unit test. 445 // If there is no UI thread, we're most likely in a unit test.
446 return !BrowserThread::IsWellKnownThread(BrowserThread::UI) || 446 return !BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
447 BrowserThread::CurrentlyOn(BrowserThread::UI); 447 BrowserThread::CurrentlyOn(BrowserThread::UI);
448 } 448 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698