ash/system/locale/locale_notification_controller.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: ash/system/locale/locale_notification_controller.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') | « ash/system/chromeos/tray_display_unittest.cc ('k') | ash/system/system_notifier.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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 "ash/system/locale/locale_notification_controller.h"	5 #include "ash/system/locale/locale_notification_controller.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

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

9 #include "ash/shell.h"	10 #include "ash/shell.h"

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

11 #include "ash/system/tray/system_tray_notifier.h"	11 #include "ash/system/tray/system_tray_notifier.h"

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

13 #include "grit/ash_resources.h"	13 #include "grit/ash_resources.h"

14 #include "grit/ash_strings.h"	14 #include "grit/ash_strings.h"

15 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

16 #include "ui/base/resource/resource_bundle.h"	16 #include "ui/base/resource/resource_bundle.h"

17 #include "ui/message_center/message_center.h"	17 #include "ui/message_center/message_center.h"

18 #include "ui/message_center/notification.h"	18 #include "ui/message_center/notification.h"

19 #include "ui/message_center/notification_delegate.h"	19 #include "ui/message_center/notification_delegate.h"

20 #include "ui/message_center/notification_types.h"	20 #include "ui/message_center/notification_types.h"

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_LOCALE),	109 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_LOCALE),

110 base::string16() /* display_source */, GURL(),	110 base::string16() /* display_source */, GURL(),

111 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,	111 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,

112 system_notifier::kNotifierLocale),	112 system_notifier::kNotifierLocale),

113 optional, new LocaleNotificationDelegate(delegate)));	113 optional, new LocaleNotificationDelegate(delegate)));

114 message_center::MessageCenter::Get()->AddNotification(	114 message_center::MessageCenter::Get()->AddNotification(

115 std::move(notification));	115 std::move(notification));

116 }	116 }

117	117

118 } // namespace ash	118 } // namespace ash

OLD	NEW