ash/system/overview/overview_button_tray.cc - Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs

Side by Side Diff: ash/system/overview/overview_button_tray.cc

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge 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/shelf/shelf_view.cc ('K') | « ash/shelf/shelf_widget.cc ('k') | ash/system/status_area_widget_delegate.h » ('j') | ash/system/status_area_widget_delegate.h » ('J')

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/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

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

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

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

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

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

	13 #include "ash/common/system/tray/tray_constants.h"
	tdanderson 2016/06/10 22:54:43 Is this #include needed given that you haven't mad Is this #include needed given that you haven't made any other changes to this file? yiyix 2016/06/13 18:43:54 Done. Show quoted text On 2016/06/10 22:54:43, tdanderson wrote: > Is this #include needed given that you haven't made any other changes to this > file? Done.
13 #include "ash/common/wm_shell.h"	14 #include "ash/common/wm_shell.h"

14 #include "ash/shelf/shelf_util.h"	15 #include "ash/shelf/shelf_util.h"

15 #include "ash/shell.h"	16 #include "ash/shell.h"

16 #include "ash/system/tray/tray_utils.h"	17 #include "ash/system/tray/tray_utils.h"

17 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	18 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

18 #include "ash/wm/overview/window_selector_controller.h"	19 #include "ash/wm/overview/window_selector_controller.h"

19 #include "grit/ash_resources.h"	20 #include "grit/ash_resources.h"

20 #include "grit/ash_strings.h"	21 #include "grit/ash_strings.h"

21 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

22 #include "ui/base/resource/resource_bundle.h"	23 #include "ui/base/resource/resource_bundle.h"

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

145 session_state_delegate->IsActiveUserSessionStarted() &&	146 session_state_delegate->IsActiveUserSessionStarted() &&

146 !session_state_delegate->IsScreenLocked() &&	147 !session_state_delegate->IsScreenLocked() &&

147 session_state_delegate->GetSessionState() ==	148 session_state_delegate->GetSessionState() ==

148 SessionStateDelegate::SESSION_STATE_ACTIVE &&	149 SessionStateDelegate::SESSION_STATE_ACTIVE &&

149 shell->system_tray_delegate()->GetUserLoginStatus() !=	150 shell->system_tray_delegate()->GetUserLoginStatus() !=

150 LoginStatus::KIOSK_APP);	151 LoginStatus::KIOSK_APP);

151 }	152 }

152	153

153 } // namespace ash	154 } // namespace ash

OLD	NEW