Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: ash/common/system/status_area_widget_delegate.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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
OLDNEW
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/ash_switches.h"
9 #include "ash/common/focus_cycler.h" 8 #include "ash/common/focus_cycler.h"
10 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
11 #include "ash/common/shelf/shelf_constants.h" 10 #include "ash/common/shelf/shelf_constants.h"
12 #include "ash/common/shelf/wm_shelf.h" 11 #include "ash/common/shelf/wm_shelf.h"
13 #include "ash/common/shelf/wm_shelf_util.h" 12 #include "ash/common/shelf/wm_shelf_util.h"
14 #include "ash/common/shell_window_ids.h" 13 #include "ash/common/shell_window_ids.h"
15 #include "ash/common/system/tray/tray_constants.h" 14 #include "ash/common/system/tray/tray_constants.h"
16 #include "ash/common/wm_lookup.h" 15 #include "ash/common/wm_lookup.h"
17 #include "ash/common/wm_root_window_controller.h" 16 #include "ash/common/wm_root_window_controller.h"
18 #include "ash/common/wm_shell.h" 17 #include "ash/common/wm_shell.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 } 230 }
232 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge, 231 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge,
233 bottom_edge, right_edge)); 232 bottom_edge, right_edge));
234 // Layout on |child| needs to be updated based on new border value before 233 // Layout on |child| needs to be updated based on new border value before
235 // displaying; otherwise |child| will be showing with old border size. 234 // displaying; otherwise |child| will be showing with old border size.
236 // Fix for crbug.com/623438. 235 // Fix for crbug.com/623438.
237 child->Layout(); 236 child->Layout();
238 } 237 }
239 238
240 } // namespace ash 239 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/power/tray_power_unittest.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698