ash/system/overview/overview_button_tray.cc - Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3

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 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)

Patch Set: 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/overview/overview_button_tray.h ('k') | ash/system/overview/overview_button_tray_unittest.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"

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

9 #include "ash/resources/vector_icons/vector_icons.h"	7 #include "ash/resources/vector_icons/vector_icons.h"

	8 #include "ash/session/session_state_delegate.h"

10 #include "ash/shelf/shelf_constants.h"	9 #include "ash/shelf/shelf_constants.h"

11 #include "ash/strings/grit/ash_strings.h"	10 #include "ash/strings/grit/ash_strings.h"

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

13 #include "ash/system/tray/tray_constants.h"	12 #include "ash/system/tray/tray_constants.h"

14 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

15 #include "ash/wm/overview/window_selector_controller.h"	14 #include "ash/wm/overview/window_selector_controller.h"

	15 #include "ash/wm_shell.h"

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

17 #include "ui/gfx/paint_vector_icon.h"	17 #include "ui/gfx/paint_vector_icon.h"

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

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

20	20

21 namespace ash {	21 namespace ash {

22	22

23 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf)	23 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf)

24 : TrayBackgroundView(wm_shelf), icon_(new views::ImageView()) {	24 : TrayBackgroundView(wm_shelf), icon_(new views::ImageView()) {

25 SetInkDropMode(InkDropMode::ON);	25 SetInkDropMode(InkDropMode::ON);

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 !session_state_delegate->IsScreenLocked() &&	119 !session_state_delegate->IsScreenLocked() &&

120 session_state_delegate->GetSessionState() ==	120 session_state_delegate->GetSessionState() ==

121 session_manager::SessionState::ACTIVE &&	121 session_manager::SessionState::ACTIVE &&

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

123 LoginStatus::KIOSK_APP &&	123 LoginStatus::KIOSK_APP &&

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

125 LoginStatus::ARC_KIOSK_APP);	125 LoginStatus::ARC_KIOSK_APP);

126 }	126 }

127	127

128 } // namespace ash	128 } // namespace ash

OLD	NEW