| OLD | NEW |
| 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/cookies_tree_model.h" | 5 #include "chrome/browser/cookies_tree_model.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/memory/linked_ptr.h" | 12 #include "base/memory/linked_ptr.h" |
| 13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
| 14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 15 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 15 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
| 16 #include "content/browser/in_process_webkit/webkit_context.h" | 17 #include "content/browser/in_process_webkit/webkit_context.h" |
| 17 #include "grit/app_resources.h" | 18 #include "grit/app_resources.h" |
| 18 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
| 19 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
| 20 #include "net/base/cookie_monster.h" | 21 #include "net/base/cookie_monster.h" |
| 21 #include "net/base/registry_controlled_domain.h" | 22 #include "net/base/registry_controlled_domain.h" |
| 22 #include "net/url_request/url_request_context.h" | 23 #include "net/url_request/url_request_context.h" |
| 23 #include "third_party/skia/include/core/SkBitmap.h" | 24 #include "third_party/skia/include/core/SkBitmap.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 | 859 |
| 859 void CookiesTreeModel::NotifyObserverEndBatch() { | 860 void CookiesTreeModel::NotifyObserverEndBatch() { |
| 860 // Only notify the observers if this is the outermost call to EndBatch() if | 861 // Only notify the observers if this is the outermost call to EndBatch() if |
| 861 // called in a nested manner. | 862 // called in a nested manner. |
| 862 if (--batch_update_ == 0) { | 863 if (--batch_update_ == 0) { |
| 863 FOR_EACH_OBSERVER(Observer, | 864 FOR_EACH_OBSERVER(Observer, |
| 864 cookies_observer_list_, | 865 cookies_observer_list_, |
| 865 TreeModelEndBatch(this)); | 866 TreeModelEndBatch(this)); |
| 866 } | 867 } |
| 867 } | 868 } |
| OLD | NEW |