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/accessibility_types.h" |
6 #include "ash/common/shelf/shelf_layout_manager.h" | |
7 #include "ash/common/shelf/wm_shelf.h" | |
8 #include "ash/common/wm_window.h" | |
9 #include "ash/public/cpp/shell_window_ids.h" | 6 #include "ash/public/cpp/shell_window_ids.h" |
10 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shelf/wm_shelf.h" |
11 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/wm_window.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
14 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h" | 14 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h" |
15 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" | 15 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" |
16 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" | 16 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
17 #include "chrome/common/extensions/extension_constants.h" | 17 #include "chrome/common/extensions/extension_constants.h" |
18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
19 #include "extensions/browser/view_type_utils.h" | 19 #include "extensions/browser/view_type_utils.h" |
20 #include "ui/display/screen.h" | 20 #include "ui/display/screen.h" |
21 #include "ui/views/controls/webview/webview.h" | 21 #include "ui/views/controls/webview/webview.h" |
(...skipping 160 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 |