| 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/common/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" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.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/extensions/chrome_extension_web_contents_observer.h" | 15 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
| 16 #include "chrome/common/extensions/extension_constants.h" | 16 #include "chrome/common/extensions/extension_constants.h" |
| 17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 18 #include "extensions/browser/view_type_utils.h" | 18 #include "extensions/browser/view_type_utils.h" |
| 19 #include "ui/display/screen.h" | 19 #include "ui/display/screen.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 // If we're in full-screen mode, give the panel a height of 0 unless | 179 // If we're in full-screen mode, give the panel a height of 0 unless |
| 180 // it's active. | 180 // it's active. |
| 181 if (ash::GetRootWindowController(GetRootWindow()) | 181 if (ash::GetRootWindowController(GetRootWindow()) |
| 182 ->GetWindowForFullscreenMode() && | 182 ->GetWindowForFullscreenMode() && |
| 183 !widget_->IsActive()) { | 183 !widget_->IsActive()) { |
| 184 bounds.set_height(0); | 184 bounds.set_height(0); |
| 185 } | 185 } |
| 186 | 186 |
| 187 widget_->SetBounds(bounds); | 187 widget_->SetBounds(bounds); |
| 188 } | 188 } |
| OLD | NEW |