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

Side by Side Diff: ash/system/enterprise/tray_enterprise.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/system/enterprise/tray_enterprise.h ('k') | ash/system/ime/ime_observer.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/common/system/chromeos/enterprise/tray_enterprise.h" 5 #include "ash/system/enterprise/tray_enterprise.h"
6 6
7 #include "ash/common/login_status.h" 7 #include "ash/common/login_status.h"
8 #include "ash/common/system/tray/label_tray_view.h"
9 #include "ash/common/system/tray/system_tray_delegate.h"
10 #include "ash/common/system/tray/system_tray_notifier.h"
11 #include "ash/common/wm_shell.h" 8 #include "ash/common/wm_shell.h"
12 #include "ash/resources/grit/ash_resources.h" 9 #include "ash/resources/grit/ash_resources.h"
10 #include "ash/system/tray/label_tray_view.h"
11 #include "ash/system/tray/system_tray_delegate.h"
12 #include "ash/system/tray/system_tray_notifier.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 TrayEnterprise::TrayEnterprise(SystemTray* system_tray) 18 TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
19 : SystemTrayItem(system_tray, UMA_ENTERPRISE), tray_view_(nullptr) { 19 : SystemTrayItem(system_tray, UMA_ENTERPRISE), tray_view_(nullptr) {
20 WmShell::Get()->system_tray_notifier()->AddEnterpriseDomainObserver(this); 20 WmShell::Get()->system_tray_notifier()->AddEnterpriseDomainObserver(this);
21 } 21 }
22 22
(...skipping 25 matching lines...) Expand all
48 48
49 void TrayEnterprise::OnEnterpriseDomainChanged() { 49 void TrayEnterprise::OnEnterpriseDomainChanged() {
50 UpdateEnterpriseMessage(); 50 UpdateEnterpriseMessage();
51 } 51 }
52 52
53 void TrayEnterprise::OnViewClicked(views::View* sender) { 53 void TrayEnterprise::OnViewClicked(views::View* sender) {
54 WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo(); 54 WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
55 } 55 }
56 56
57 } // namespace ash 57 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/enterprise/tray_enterprise.h ('k') | ash/system/ime/ime_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698