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

Side by Side Diff: chrome/browser/notifications/message_center_settings_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
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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 29 matching lines...) Expand all
40 #include "extensions/common/extension.h" 40 #include "extensions/common/extension.h"
41 #include "extensions/common/permissions/permissions_data.h" 41 #include "extensions/common/permissions/permissions_data.h"
42 #include "grit/theme_resources.h" 42 #include "grit/theme_resources.h"
43 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/gfx/image/image.h" 45 #include "ui/gfx/image/image.h"
46 #include "ui/message_center/message_center_style.h" 46 #include "ui/message_center/message_center_style.h"
47 #include "ui/strings/grit/ui_strings.h" 47 #include "ui/strings/grit/ui_strings.h"
48 48
49 #if defined(OS_CHROMEOS) 49 #if defined(OS_CHROMEOS)
50 #include "ash/system/system_notifier.h" 50 #include "ash/common/system/system_notifier.h"
51 #include "chrome/browser/chromeos/profiles/profile_helper.h" 51 #include "chrome/browser/chromeos/profiles/profile_helper.h"
52 #include "chrome/browser/notifications/arc_notifier_manager.h" 52 #include "chrome/browser/notifications/arc_notifier_manager.h"
53 #include "components/arc/arc_bridge_service.h" 53 #include "components/arc/arc_bridge_service.h"
54 #endif 54 #endif
55 55
56 using message_center::Notifier; 56 using message_center::Notifier;
57 using message_center::NotifierId; 57 using message_center::NotifierId;
58 58
59 namespace message_center { 59 namespace message_center {
60 60
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 weak_factory_.GetWeakPtr())); 594 weak_factory_.GetWeakPtr()));
595 } 595 }
596 #endif 596 #endif
597 597
598 if (notify) { 598 if (notify) {
599 FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver, 599 FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
600 observers_, 600 observers_,
601 NotifierGroupChanged()); 601 NotifierGroupChanged());
602 } 602 }
603 } 603 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698