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

Side by Side Diff: chrome/browser/cookies_tree_model.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 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) 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/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/bind.h" 11 #include "base/bind.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/browsing_data_cookie_helper.h" 15 #include "chrome/browser/browsing_data_cookie_helper.h"
16 #include "chrome/browser/browsing_data_server_bound_cert_helper.h" 16 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
17 #include "chrome/browser/content_settings/cookie_settings.h" 17 #include "chrome/browser/content_settings/cookie_settings.h"
18 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
19 #include "content/public/common/url_constants.h" 19 #include "content/public/common/url_constants.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
22 #include "grit/theme_resources_standard.h"
23 #include "grit/ui_resources.h" 22 #include "grit/ui_resources.h"
24 #include "net/base/registry_controlled_domain.h" 23 #include "net/base/registry_controlled_domain.h"
25 #include "net/cookies/cookie_monster.h" 24 #include "net/cookies/cookie_monster.h"
26 #include "net/url_request/url_request_context.h" 25 #include "net/url_request/url_request_context.h"
27 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
29 #include "ui/gfx/image/image_skia.h" 28 #include "ui/gfx/image/image_skia.h"
30 29
31 namespace { 30 namespace {
32 31
(...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 1119
1121 void CookiesTreeModel::NotifyObserverEndBatch() { 1120 void CookiesTreeModel::NotifyObserverEndBatch() {
1122 // Only notify the observers if this is the outermost call to EndBatch() if 1121 // Only notify the observers if this is the outermost call to EndBatch() if
1123 // called in a nested manner. 1122 // called in a nested manner.
1124 if (--batch_update_ == 0) { 1123 if (--batch_update_ == 0) {
1125 FOR_EACH_OBSERVER(Observer, 1124 FOR_EACH_OBSERVER(Observer,
1126 cookies_observer_list_, 1125 cookies_observer_list_,
1127 TreeModelEndBatch(this)); 1126 TreeModelEndBatch(this));
1128 } 1127 }
1129 } 1128 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698