OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/aura/wm_window_aura.h" | 5 #include "ash/aura/wm_window_aura.h" |
6 #include "ash/common/accessibility_types.h" | 6 #include "ash/common/accessibility_types.h" |
7 #include "ash/common/shelf/shelf_layout_manager.h" | 7 #include "ash/common/shelf/shelf_layout_manager.h" |
8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 views::Widget::InitParams params( | 89 views::Widget::InitParams params( |
90 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 90 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
91 aura::Window* root_window = ash::Shell::GetPrimaryRootWindow(); | 91 aura::Window* root_window = ash::Shell::GetPrimaryRootWindow(); |
92 params.parent = ash::Shell::GetContainer( | 92 params.parent = ash::Shell::GetContainer( |
93 root_window, ash::kShellWindowId_SettingBubbleContainer); | 93 root_window, ash::kShellWindowId_SettingBubbleContainer); |
94 params.delegate = this; | 94 params.delegate = this; |
95 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; | 95 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; |
96 params.bounds = gfx::Rect(0, 0, root_window->bounds().width(), | 96 params.bounds = gfx::Rect(0, 0, root_window->bounds().width(), |
97 root_window->bounds().height()); | 97 root_window->bounds().height()); |
98 widget_->Init(params); | 98 widget_->Init(params); |
99 SetShadowType(widget_->GetNativeWindow(), wm::SHADOW_TYPE_RECTANGULAR); | 99 SetShadowElevation(widget_->GetNativeWindow(), wm::ShadowElevation::MEDIUM); |
100 | 100 |
101 display::Screen::GetScreen()->AddObserver(this); | 101 display::Screen::GetScreen()->AddObserver(this); |
102 } | 102 } |
103 | 103 |
104 ChromeVoxPanel::~ChromeVoxPanel() { | 104 ChromeVoxPanel::~ChromeVoxPanel() { |
105 display::Screen::GetScreen()->RemoveObserver(this); | 105 display::Screen::GetScreen()->RemoveObserver(this); |
106 } | 106 } |
107 | 107 |
108 aura::Window* ChromeVoxPanel::GetRootWindow() { | 108 aura::Window* ChromeVoxPanel::GetRootWindow() { |
109 return GetWidget()->GetNativeWindow()->GetRootWindow(); | 109 return GetWidget()->GetNativeWindow()->GetRootWindow(); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 // If we're in full-screen mode, give the panel a height of 0 unless | 182 // If we're in full-screen mode, give the panel a height of 0 unless |
183 // it's active. | 183 // it's active. |
184 if (ash::GetRootWindowController(GetRootWindow()) | 184 if (ash::GetRootWindowController(GetRootWindow()) |
185 ->GetWindowForFullscreenMode() && | 185 ->GetWindowForFullscreenMode() && |
186 !widget_->IsActive()) { | 186 !widget_->IsActive()) { |
187 bounds.set_height(0); | 187 bounds.set_height(0); |
188 } | 188 } |
189 | 189 |
190 widget_->SetBounds(bounds); | 190 widget_->SetBounds(bounds); |
191 } | 191 } |
OLD | NEW |