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

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

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: merge 2 trunk Created 4 years, 8 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/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/ash_switches.h"
9 #include "ash/focus_cycler.h" 9 #include "ash/focus_cycler.h"
10 #include "ash/shelf/shelf_util.h" 10 #include "ash/shelf/shelf_util.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 private: 43 private:
44 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegateAnimationSettings); 44 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegateAnimationSettings);
45 }; 45 };
46 46
47 } // namespace 47 } // namespace
48 48
49 namespace ash { 49 namespace ash {
50 50
51 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate() 51 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
52 : focus_cycler_for_testing_(NULL), 52 : focus_cycler_for_testing_(NULL), alignment_(wm::SHELF_ALIGNMENT_BOTTOM) {
James Cook 2016/04/26 15:22:34 nullptr while you're here
sky 2016/04/26 16:26:02 Done.
53 alignment_(SHELF_ALIGNMENT_BOTTOM) {
54 // Allow the launcher to surrender the focus to another window upon 53 // Allow the launcher to surrender the focus to another window upon
55 // navigation completion by the user. 54 // navigation completion by the user.
56 set_allow_deactivate_on_esc(true); 55 set_allow_deactivate_on_esc(true);
57 SetPaintToLayer(true); 56 SetPaintToLayer(true);
58 layer()->SetFillsBoundsOpaquely(false); 57 layer()->SetFillsBoundsOpaquely(false);
59 } 58 }
60 59
61 StatusAreaWidgetDelegate::~StatusAreaWidgetDelegate() { 60 StatusAreaWidgetDelegate::~StatusAreaWidgetDelegate() {
62 } 61 }
63 62
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) { 164 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) {
166 UpdateLayout(); 165 UpdateLayout();
167 } 166 }
168 167
169 void StatusAreaWidgetDelegate::UpdateWidgetSize() { 168 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
170 if (GetWidget()) 169 if (GetWidget())
171 GetWidget()->SetSize(GetPreferredSize()); 170 GetWidget()->SetSize(GetPreferredSize());
172 } 171 }
173 172
174 } // namespace ash 173 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698