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

Side by Side Diff: chrome/browser/notifications/message_center_settings_controller.cc

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h" 5 #include "chrome/browser/notifications/message_center_settings_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/string_compare.h" 10 #include "base/i18n/string_compare.h"
11 #include "base/message_loop/message_loop_proxy.h" 11 #include "base/message_loop/message_loop_proxy.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/task/cancelable_task_tracker.h"
13 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/extensions/app_icon_loader_impl.h" 16 #include "chrome/browser/extensions/app_icon_loader_impl.h"
16 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/favicon/favicon_service.h" 18 #include "chrome/browser/favicon/favicon_service.h"
18 #include "chrome/browser/favicon/favicon_service_factory.h" 19 #include "chrome/browser/favicon/favicon_service_factory.h"
19 #include "chrome/browser/history/history_types.h" 20 #include "chrome/browser/history/history_types.h"
20 #include "chrome/browser/notifications/desktop_notification_service.h" 21 #include "chrome/browser/notifications/desktop_notification_service.h"
21 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 22 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
22 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" 23 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
23 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 24 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
24 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/profiles/profile_info_cache.h" 26 #include "chrome/browser/profiles/profile_info_cache.h"
26 #include "chrome/browser/profiles/profile_manager.h" 27 #include "chrome/browser/profiles/profile_manager.h"
27 #include "chrome/common/cancelable_task_tracker.h"
28 #include "chrome/common/extensions/api/notifications.h" 28 #include "chrome/common/extensions/api/notifications.h"
29 #include "chrome/common/extensions/extension_constants.h" 29 #include "chrome/common/extensions/extension_constants.h"
30 #include "chrome/common/favicon/favicon_types.h" 30 #include "chrome/common/favicon/favicon_types.h"
31 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/notification_source.h" 32 #include "content/public/browser/notification_source.h"
33 #include "extensions/browser/event_router.h" 33 #include "extensions/browser/event_router.h"
34 #include "extensions/browser/extension_system.h" 34 #include "extensions/browser/extension_system.h"
35 #include "grit/theme_resources.h" 35 #include "grit/theme_resources.h"
36 #include "grit/ui_strings.h" 36 #include "grit/ui_strings.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 std::sort(notifiers->begin(), notifiers->end(), SimpleCompareNotifiers); 251 std::sort(notifiers->begin(), notifiers->end(), SimpleCompareNotifiers);
252 } 252 }
253 } 253 }
254 254
255 int app_count = notifiers->size(); 255 int app_count = notifiers->size();
256 256
257 ContentSettingsForOneType settings; 257 ContentSettingsForOneType settings;
258 notification_service->GetNotificationsSettings(&settings); 258 notification_service->GetNotificationsSettings(&settings);
259 FaviconService* favicon_service = 259 FaviconService* favicon_service =
260 FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS); 260 FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
261 favicon_tracker_.reset(new CancelableTaskTracker()); 261 favicon_tracker_.reset(new base::CancelableTaskTracker());
262 patterns_.clear(); 262 patterns_.clear();
263 for (ContentSettingsForOneType::const_iterator iter = settings.begin(); 263 for (ContentSettingsForOneType::const_iterator iter = settings.begin();
264 iter != settings.end(); ++iter) { 264 iter != settings.end(); ++iter) {
265 if (iter->primary_pattern == ContentSettingsPattern::Wildcard() && 265 if (iter->primary_pattern == ContentSettingsPattern::Wildcard() &&
266 iter->secondary_pattern == ContentSettingsPattern::Wildcard() && 266 iter->secondary_pattern == ContentSettingsPattern::Wildcard() &&
267 iter->source != "preference") { 267 iter->source != "preference") {
268 continue; 268 continue;
269 } 269 }
270 270
271 std::string url_pattern = iter->primary_pattern.ToString(); 271 std::string url_pattern = iter->primary_pattern.ToString();
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 // creating a primary profile, and causes an infinite loop. 533 // creating a primary profile, and causes an infinite loop.
534 // Thus, it would be better to delay creating group for guest login. 534 // Thus, it would be better to delay creating group for guest login.
535 base::MessageLoopProxy::current()->PostTask( 535 base::MessageLoopProxy::current()->PostTask(
536 FROM_HERE, 536 FROM_HERE,
537 base::Bind( 537 base::Bind(
538 &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin, 538 &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin,
539 weak_factory_.GetWeakPtr())); 539 weak_factory_.GetWeakPtr()));
540 } 540 }
541 #endif 541 #endif
542 } 542 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698