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 "chrome/browser/chromeos/accessibility/chromevox_panel.h" | 5 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h" |
6 | 6 |
7 #include "ash/accessibility_types.h" | 7 #include "ash/accessibility_types.h" |
8 #include "ash/public/cpp/shell_window_ids.h" | 8 #include "ash/public/cpp/shell_window_ids.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/shelf/shelf.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 11 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shelf/wm_shelf.h" | |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/wm_window.h" | 13 #include "ash/wm_window.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
16 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 16 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
17 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" | 17 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" |
18 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" | 18 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
19 #include "chrome/common/extensions/extension_constants.h" | 19 #include "chrome/common/extensions/extension_constants.h" |
20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
21 #include "extensions/browser/view_type_utils.h" | 21 #include "extensions/browser/view_type_utils.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 ->GetWindowForFullscreenMode() && | 195 ->GetWindowForFullscreenMode() && |
196 !widget_->IsActive()) { | 196 !widget_->IsActive()) { |
197 bounds.set_height(0); | 197 bounds.set_height(0); |
198 } | 198 } |
199 | 199 |
200 widget_->SetBounds(bounds); | 200 widget_->SetBounds(bounds); |
201 } | 201 } |
202 | 202 |
203 void ChromeVoxPanel::SendPanelHeightToAsh(int panel_height) { | 203 void ChromeVoxPanel::SendPanelHeightToAsh(int panel_height) { |
204 // TODO(mash): Replace with shelf mojo API. | 204 // TODO(mash): Replace with shelf mojo API. |
205 ash::WmShelf* shelf = ash::WmShelf::ForWindow(GetRootWindow()); | 205 ash::Shelf* shelf = ash::Shelf::ForWindow(GetRootWindow()); |
206 ash::ShelfLayoutManager* shelf_layout_manager = | 206 ash::ShelfLayoutManager* shelf_layout_manager = |
207 shelf ? shelf->shelf_layout_manager() : nullptr; | 207 shelf ? shelf->shelf_layout_manager() : nullptr; |
208 if (shelf_layout_manager) | 208 if (shelf_layout_manager) |
209 shelf_layout_manager->SetChromeVoxPanelHeight(panel_height); | 209 shelf_layout_manager->SetChromeVoxPanelHeight(panel_height); |
210 } | 210 } |
OLD | NEW |