| 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/common/accessibility_types.h" | 5 #include "ash/common/accessibility_types.h" |
| 6 #include "ash/common/shell_window_ids.h" | 6 #include "ash/common/shell_window_ids.h" |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 132 |
| 133 void ChromeVoxPanel::ExitFullscreen() { | 133 void ChromeVoxPanel::ExitFullscreen() { |
| 134 widget_->Deactivate(); | 134 widget_->Deactivate(); |
| 135 widget_->widget_delegate()->set_can_activate(false); | 135 widget_->widget_delegate()->set_can_activate(false); |
| 136 panel_fullscreen_ = false; | 136 panel_fullscreen_ = false; |
| 137 UpdateWidgetBounds(); | 137 UpdateWidgetBounds(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 void ChromeVoxPanel::DisableSpokenFeedback() { | 140 void ChromeVoxPanel::DisableSpokenFeedback() { |
| 141 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( | 141 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( |
| 142 false, ui::A11Y_NOTIFICATION_NONE); | 142 false, ash::A11Y_NOTIFICATION_NONE); |
| 143 } | 143 } |
| 144 | 144 |
| 145 void ChromeVoxPanel::Focus() { | 145 void ChromeVoxPanel::Focus() { |
| 146 widget_->widget_delegate()->set_can_activate(true); | 146 widget_->widget_delegate()->set_can_activate(true); |
| 147 widget_->Activate(); | 147 widget_->Activate(); |
| 148 web_view_->RequestFocus(); | 148 web_view_->RequestFocus(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 const views::Widget* ChromeVoxPanel::GetWidget() const { | 151 const views::Widget* ChromeVoxPanel::GetWidget() const { |
| 152 return widget_; | 152 return widget_; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 177 // If we're in full-screen mode, give the panel a height of 0 unless | 177 // If we're in full-screen mode, give the panel a height of 0 unless |
| 178 // it's active. | 178 // it's active. |
| 179 if (ash::GetRootWindowController(GetRootWindow()) | 179 if (ash::GetRootWindowController(GetRootWindow()) |
| 180 ->GetWindowForFullscreenMode() && | 180 ->GetWindowForFullscreenMode() && |
| 181 !widget_->IsActive()) { | 181 !widget_->IsActive()) { |
| 182 bounds.set_height(0); | 182 bounds.set_height(0); |
| 183 } | 183 } |
| 184 | 184 |
| 185 widget_->SetBounds(bounds); | 185 widget_->SetBounds(bounds); |
| 186 } | 186 } |
| OLD | NEW |