chrome/browser/notifications/message_center_settings_controller.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/notifications/message_center_notifications_browsertest.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/i18n/string_compare.h"	9 #include "base/i18n/string_compare.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

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

12 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/favicon/favicon_service.h"	13 #include "chrome/browser/favicon/favicon_service.h"

14 #include "chrome/browser/favicon/favicon_service_factory.h"	14 #include "chrome/browser/favicon/favicon_service_factory.h"

15 #include "chrome/browser/favicon/favicon_types.h"	15 #include "chrome/browser/favicon/favicon_types.h"

16 #include "chrome/browser/history/history_types.h"	16 #include "chrome/browser/history/history_types.h"

17 #include "chrome/browser/notifications/desktop_notification_service.h"	17 #include "chrome/browser/notifications/desktop_notification_service.h"

18 #include "chrome/browser/notifications/desktop_notification_service_factory.h"	18 #include "chrome/browser/notifications/desktop_notification_service_factory.h"

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

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

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
226 delegate_->UpdateFavicon(url, favicon_result.image);	226 delegate_->UpdateFavicon(url, favicon_result.image);

227 }	227 }

228	228

229	229

230 void MessageCenterSettingsController::SetAppImage(const std::string& id,	230 void MessageCenterSettingsController::SetAppImage(const std::string& id,

231 const gfx::ImageSkia& image) {	231 const gfx::ImageSkia& image) {

232 if (!delegate_)	232 if (!delegate_)

233 return;	233 return;

234 delegate_->UpdateIconImage(id, gfx::Image(image) );	234 delegate_->UpdateIconImage(id, gfx::Image(image) );

235 }	235 }

OLD	NEW