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

Side by Side Diff: ash/system/chromeos/enterprise/tray_enterprise.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
« no previous file with comments | « ash/system/chromeos/enterprise/tray_enterprise.h ('k') | ash/system/chromeos/label_tray_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/enterprise/tray_enterprise.h" 5 #include "ash/system/chromeos/enterprise/tray_enterprise.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/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "grit/ash_resources.h" 12 #include "grit/ash_resources.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace internal {
16 15
17 TrayEnterprise::TrayEnterprise(SystemTray* system_tray) 16 TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
18 : SystemTrayItem(system_tray), 17 : SystemTrayItem(system_tray),
19 tray_view_(NULL) { 18 tray_view_(NULL) {
20 Shell::GetInstance()->system_tray_notifier()-> 19 Shell::GetInstance()->system_tray_notifier()->
21 AddEnterpriseDomainObserver(this); 20 AddEnterpriseDomainObserver(this);
22 } 21 }
23 22
24 TrayEnterprise::~TrayEnterprise() { 23 TrayEnterprise::~TrayEnterprise() {
25 Shell::GetInstance()->system_tray_notifier()-> 24 Shell::GetInstance()->system_tray_notifier()->
(...skipping 23 matching lines...) Expand all
49 } 48 }
50 49
51 void TrayEnterprise::OnEnterpriseDomainChanged() { 50 void TrayEnterprise::OnEnterpriseDomainChanged() {
52 UpdateEnterpriseMessage(); 51 UpdateEnterpriseMessage();
53 } 52 }
54 53
55 void TrayEnterprise::OnViewClicked(views::View* sender) { 54 void TrayEnterprise::OnViewClicked(views::View* sender) {
56 Shell::GetInstance()->system_tray_delegate()->ShowEnterpriseInfo(); 55 Shell::GetInstance()->system_tray_delegate()->ShowEnterpriseInfo();
57 } 56 }
58 57
59 } // namespace internal
60 } // namespace ash 58 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/enterprise/tray_enterprise.h ('k') | ash/system/chromeos/label_tray_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698