ash/system/status_area_widget_delegate.cc - Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS.

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/status_area_widget_delegate.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix broken relative include. 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/overview/overview_button_tray_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

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/status_area_widget_delegate.h"	5 #include "ash/system/status_area_widget_delegate.h"

6	6

7 #include "ash/ash_export.h"	7 #include "ash/ash_export.h"

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

9 #include "ash/common/focus_cycler.h"	9 #include "ash/common/focus_cycler.h"

10 #include "ash/common/material_design/material_design_controller.h"	10 #include "ash/common/material_design/material_design_controller.h"

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

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

13 #include "ash/common/shell_window_ids.h"	13 #include "ash/common/shell_window_ids.h"

14 #include "ash/common/system/tray/tray_constants.h"	14 #include "ash/common/system/tray/tray_constants.h"

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

16 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

17 #include "ui/compositor/layer.h"	17 #include "ui/compositor/layer.h"

18 #include "ui/compositor/scoped_layer_animation_settings.h"	18 #include "ui/compositor/scoped_layer_animation_settings.h"

(...skipping 218 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0;	237 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0;

238 right_edge =	238 right_edge =

239 GetShelfConstant(SHELF_SIZE) - kShelfItemInset - kShelfItemHeight;	239 GetShelfConstant(SHELF_SIZE) - kShelfItemInset - kShelfItemHeight;

240 }	240 }

241 }	241 }

242 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge,	242 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge,

243 bottom_edge, right_edge));	243 bottom_edge, right_edge));

244 }	244 }

245	245

246 } // namespace ash	246 } // namespace ash

OLD	NEW