ash/common/system/status_area_widget_delegate.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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/common/system/status_area_widget.cc ('k') | ash/common/system/toast/toast_overlay.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/common/system/status_area_widget_delegate.h"	5 #include "ash/common/system/status_area_widget_delegate.h"

6	6

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

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

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

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

11 #include "ash/common/shelf/wm_shelf.h"	11 #include "ash/common/shelf/wm_shelf.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"

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

15 #include "ash/common/wm_lookup.h"	14 #include "ash/common/wm_lookup.h"

16 #include "ash/common/wm_root_window_controller.h"	15 #include "ash/common/wm_root_window_controller.h"

17 #include "ash/common/wm_shell.h"	16 #include "ash/common/wm_shell.h"

18 #include "ash/common/wm_window.h"	17 #include "ash/common/wm_window.h"

	18 #include "ash/public/cpp/shell_window_ids.h"

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

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

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

22 #include "ui/gfx/animation/tween.h"	22 #include "ui/gfx/animation/tween.h"

23 #include "ui/gfx/canvas.h"	23 #include "ui/gfx/canvas.h"

24 #include "ui/gfx/image/image.h"	24 #include "ui/gfx/image/image.h"

25 #include "ui/views/accessible_pane_view.h"	25 #include "ui/views/accessible_pane_view.h"

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

27 #include "ui/views/layout/grid_layout.h"	27 #include "ui/views/layout/grid_layout.h"

28 #include "ui/views/widget/widget.h"	28 #include "ui/views/widget/widget.h"

(...skipping 219 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
248 }	248 }

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

250 bottom_edge, right_edge));	250 bottom_edge, right_edge));

251 // Layout on \|child\| needs to be updated based on new border value before	251 // Layout on \|child\| needs to be updated based on new border value before

252 // displaying; otherwise \|child\| will be showing with old border size.	252 // displaying; otherwise \|child\| will be showing with old border size.

253 // Fix for crbug.com/623438.	253 // Fix for crbug.com/623438.

254 child->Layout();	254 child->Layout();

255 }	255 }

256	256

257 } // namespace ash	257 } // namespace ash

OLD	NEW