OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/wm/dock/docked_window_layout_manager.h" | 5 #include "ash/wm/dock/docked_window_layout_manager.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/screen_util.h" | 8 #include "ash/screen_util.h" |
9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
10 #include "ash/shelf/shelf_constants.h" | 10 #include "ash/shelf/shelf_constants.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 virtual void UpdateBackground(int alpha) OVERRIDE { | 131 virtual void UpdateBackground(int alpha) OVERRIDE { |
132 alpha_ = alpha; | 132 alpha_ = alpha; |
133 SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size())); | 133 SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size())); |
134 } | 134 } |
135 | 135 |
136 private: | 136 private: |
137 void InitWidget(aura::Window* parent) { | 137 void InitWidget(aura::Window* parent) { |
138 views::Widget::InitParams params; | 138 views::Widget::InitParams params; |
139 params.type = views::Widget::InitParams::TYPE_POPUP; | 139 params.type = views::Widget::InitParams::TYPE_POPUP; |
140 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 140 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 141 params.can_activate = false; |
141 params.keep_on_top = false; | 142 params.keep_on_top = false; |
142 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 143 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
143 params.parent = parent; | 144 params.parent = parent; |
144 params.accept_events = false; | 145 params.accept_events = false; |
145 set_focus_on_creation(false); | 146 set_focus_on_creation(false); |
146 Init(params); | 147 Init(params); |
147 SetVisibilityChangedAnimationsEnabled(false); | 148 SetVisibilityChangedAnimationsEnabled(false); |
148 GetNativeWindow()->SetProperty(kStayInSameRootWindowKey, true); | 149 GetNativeWindow()->SetProperty(kStayInSameRootWindowKey, true); |
149 opaque_background_.SetColor(SK_ColorBLACK); | 150 opaque_background_.SetColor(SK_ColorBLACK); |
150 opaque_background_.SetBounds(gfx::Rect(GetWindowBoundsInScreen().size())); | 151 opaque_background_.SetBounds(gfx::Rect(GetWindowBoundsInScreen().size())); |
(...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 | 1322 |
1322 void DockedWindowLayoutManager::OnKeyboardBoundsChanging( | 1323 void DockedWindowLayoutManager::OnKeyboardBoundsChanging( |
1323 const gfx::Rect& keyboard_bounds) { | 1324 const gfx::Rect& keyboard_bounds) { |
1324 // This bounds change will have caused a change to the Shelf which does not | 1325 // This bounds change will have caused a change to the Shelf which does not |
1325 // propagate automatically to this class, so manually recalculate bounds. | 1326 // propagate automatically to this class, so manually recalculate bounds. |
1326 Relayout(); | 1327 Relayout(); |
1327 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); | 1328 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); |
1328 } | 1329 } |
1329 | 1330 |
1330 } // namespace ash | 1331 } // namespace ash |
OLD | NEW |