chrome/browser/sync/sync_error_notifier_ash.cc - Issue 2072013002: mash: Move tray settings and deps to common.

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/sync/sync_error_notifier_ash.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 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

« ash/common/DEPS ('K') | « chrome/browser/signin/signin_error_notifier_ash.cc ('k') | chrome/browser/ui/ash/chrome_screenshot_grabber.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/sync/sync_error_notifier_ash.h"	5 #include "chrome/browser/sync/sync_error_notifier_ash.h"

6	6

	7 #include "ash/common/system/system_notifier.h"

7 #include "ash/shell.h"	8 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

9 #include "ash/system/system_notifier.h"

10 #include "base/macros.h"	10 #include "base/macros.h"

11 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

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

13 #include "build/build_config.h"	13 #include "build/build_config.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/notifications/notification.h"	15 #include "chrome/browser/notifications/notification.h"

16 #include "chrome/browser/notifications/notification_ui_manager.h"	16 #include "chrome/browser/notifications/notification_ui_manager.h"

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

18 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"	18 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

19 #include "chrome/browser/ui/chrome_pages.h"	19 #include "chrome/browser/ui/chrome_pages.h"

(...skipping 156 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
176 message_center::NOTIFICATION_TYPE_SIMPLE,	176 message_center::NOTIFICATION_TYPE_SIMPLE,

177 l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE),	177 l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE),

178 l10n_util::GetStringUTF16(IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE),	178 l10n_util::GetStringUTF16(IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE),

179 ui::ResourceBundle::GetSharedInstance().GetImageNamed(	179 ui::ResourceBundle::GetSharedInstance().GetImageNamed(

180 IDR_NOTIFICATION_ALERT),	180 IDR_NOTIFICATION_ALERT),

181 notifier_id,	181 notifier_id,

182 base::string16(), // display_source	182 base::string16(), // display_source

183 GURL(notification_id_), notification_id_, data, delegate);	183 GURL(notification_id_), notification_id_, data, delegate);

184 notification_ui_manager->Add(notification, profile_);	184 notification_ui_manager->Add(notification, profile_);

185 }	185 }

OLD	NEW