ash/system/overview/overview_button_tray.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/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/overview/overview_button_tray.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « ash/system/ime/tray_ime_chromeos.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/overview/overview_button_tray.h"	5 #include "ash/system/overview/overview_button_tray.h"

6	6

7 #include "ash/common/session/session_state_delegate.h"	7 #include "ash/common/session/session_state_delegate.h"

8 #include "ash/common/shelf/shelf_types.h"	8 #include "ash/common/shelf/shelf_types.h"

9 #include "ash/common/shelf/wm_shelf_util.h"	9 #include "ash/common/shelf/wm_shelf_util.h"

	10 #include "ash/common/system/tray/system_tray_delegate.h"

10 #include "ash/common/wm_shell.h"	11 #include "ash/common/wm_shell.h"

11 #include "ash/shelf/shelf_util.h"	12 #include "ash/shelf/shelf_util.h"

12 #include "ash/shell.h"	13 #include "ash/shell.h"

13 #include "ash/system/tray/system_tray_delegate.h"

14 #include "ash/system/tray/tray_utils.h"	14 #include "ash/system/tray/tray_utils.h"

15 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	15 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

16 #include "ash/wm/overview/window_selector_controller.h"	16 #include "ash/wm/overview/window_selector_controller.h"

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

18 #include "grit/ash_strings.h"	18 #include "grit/ash_strings.h"

19 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/views/border.h"	21 #include "ui/views/border.h"

22 #include "ui/views/controls/image_view.h"	22 #include "ui/views/controls/image_view.h"

23	23

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&	133 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&

134 session_state_delegate->IsActiveUserSessionStarted() &&	134 session_state_delegate->IsActiveUserSessionStarted() &&

135 !session_state_delegate->IsScreenLocked() &&	135 !session_state_delegate->IsScreenLocked() &&

136 session_state_delegate->GetSessionState() ==	136 session_state_delegate->GetSessionState() ==

137 SessionStateDelegate::SESSION_STATE_ACTIVE &&	137 SessionStateDelegate::SESSION_STATE_ACTIVE &&

138 shell->system_tray_delegate()->GetUserLoginStatus() !=	138 shell->system_tray_delegate()->GetUserLoginStatus() !=

139 LoginStatus::KIOSK_APP);	139 LoginStatus::KIOSK_APP);

140 }	140 }

141	141

142 } // namespace ash	142 } // namespace ash

OLD	NEW