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

Side by Side Diff: ash/system/chromeos/managed/tray_locally_managed_user.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/managed/tray_locally_managed_user.h" 5 #include "ash/system/chromeos/managed/tray_locally_managed_user.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/chromeos/label_tray_view.h" 8 #include "ash/system/chromeos/label_tray_view.h"
9 #include "ash/system/system_notifier.h" 9 #include "ash/system/system_notifier.h"
10 #include "ash/system/tray/system_tray_notifier.h" 10 #include "ash/system/tray/system_tray_notifier.h"
11 #include "ash/system/tray/tray_notification_view.h" 11 #include "ash/system/tray/tray_notification_view.h"
12 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "grit/ash_resources.h" 15 #include "grit/ash_resources.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 20
21 using message_center::Notification; 21 using message_center::Notification;
22 22
23 namespace ash { 23 namespace ash {
24 namespace internal {
25 24
26 const char TrayLocallyManagedUser::kNotificationId[] = 25 const char TrayLocallyManagedUser::kNotificationId[] =
27 "chrome://user/locally-managed"; 26 "chrome://user/locally-managed";
28 27
29 TrayLocallyManagedUser::TrayLocallyManagedUser(SystemTray* system_tray) 28 TrayLocallyManagedUser::TrayLocallyManagedUser(SystemTray* system_tray)
30 : SystemTrayItem(system_tray), 29 : SystemTrayItem(system_tray),
31 tray_view_(NULL), 30 tray_view_(NULL),
32 status_(ash::user::LOGGED_IN_NONE) { 31 status_(ash::user::LOGGED_IN_NONE) {
33 } 32 }
34 33
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 message_center::Notification::CreateSystemNotification( 81 message_center::Notification::CreateSystemNotification(
83 kNotificationId, 82 kNotificationId,
84 base::string16() /* no title */, 83 base::string16() /* no title */,
85 new_message, 84 new_message,
86 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER), 85 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER),
87 system_notifier::kNotifierLocallyManagedUser, 86 system_notifier::kNotifierLocallyManagedUser,
88 base::Closure() /* null callback */)); 87 base::Closure() /* null callback */));
89 message_center::MessageCenter::Get()->AddNotification(notification.Pass()); 88 message_center::MessageCenter::Get()->AddNotification(notification.Pass());
90 } 89 }
91 90
92 } // namespace internal 91 } // namespace ash
93 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698