chrome/browser/notifications/message_center_settings_controller.cc - Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller.h ('k') | chrome/browser/password_manager/password_store_consumer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_settings_controller.cc

diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc

index 649361335fc7a6614e6dd6d40bb1db33a8ad0162..d2148a83e4e81233f059b420dacb3d809ed8ac7e 100644

--- a/chrome/browser/notifications/message_center_settings_controller.cc

+++ b/chrome/browser/notifications/message_center_settings_controller.cc

@@ -10,6 +10,7 @@

#include "base/i18n/string_compare.h"

#include "base/message_loop/message_loop_proxy.h"

#include "base/strings/utf_string_conversions.h"

+#include "base/task/cancelable_task_tracker.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/app_icon_loader_impl.h"

@@ -24,7 +25,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_info_cache.h"

#include "chrome/browser/profiles/profile_manager.h"

-#include "chrome/common/cancelable_task_tracker.h"

#include "chrome/common/extensions/api/notifications.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/favicon/favicon_types.h"

@@ -258,7 +258,7 @@ void MessageCenterSettingsController::GetNotifierList(

notification_service->GetNotificationsSettings(&settings);

FaviconService* favicon_service =

FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);

- favicon_tracker_.reset(new CancelableTaskTracker());

+ favicon_tracker_.reset(new base::CancelableTaskTracker());

patterns_.clear();

for (ContentSettingsForOneType::const_iterator iter = settings.begin();

iter != settings.end(); ++iter) {