ash/system/chromeos/enterprise/tray_enterprise.cc - Issue 2099793002: mash: Migrate some system user files 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/chromeos/enterprise/tray_enterprise.cc

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup 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/root_window_controller.h ('K') | « ash/shell/content/client/shell_browser_main_parts.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/common/login_status.h"

7 #include "ash/common/system/tray/system_tray_delegate.h"	8 #include "ash/common/system/tray/system_tray_delegate.h"

8 #include "ash/common/wm_shell.h"	9 #include "ash/common/wm_shell.h"

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

10 #include "ash/system/chromeos/label_tray_view.h"	11 #include "ash/system/chromeos/label_tray_view.h"

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

12 #include "ash/system/user/login_status.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

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

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

16	16

17 namespace ash {	17 namespace ash {

18	18

19 TrayEnterprise::TrayEnterprise(SystemTray* system_tray)	19 TrayEnterprise::TrayEnterprise(SystemTray* system_tray)

20 : SystemTrayItem(system_tray),	20 : SystemTrayItem(system_tray),

21 tray_view_(NULL) {	21 tray_view_(NULL) {

22 Shell::GetInstance()->system_tray_notifier()->	22 Shell::GetInstance()->system_tray_notifier()->

(...skipping 29 matching lines...) Expand all Loading...
52	52

53 void TrayEnterprise::OnEnterpriseDomainChanged() {	53 void TrayEnterprise::OnEnterpriseDomainChanged() {

54 UpdateEnterpriseMessage();	54 UpdateEnterpriseMessage();

55 }	55 }

56	56

57 void TrayEnterprise::OnViewClicked(views::View* sender) {	57 void TrayEnterprise::OnViewClicked(views::View* sender) {

58 WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();	58 WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();

59 }	59 }

60	60

61 } // namespace ash	61 } // namespace ash

OLD	NEW