| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/views/chrome_views_delegate.h" | 5 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/wm/window_state.h" | |
| 9 #include "ash/common/wm_shell.h" | |
| 10 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/window_state.h" |
| 11 #include "ash/wm/window_state_aura.h" | 10 #include "ash/wm/window_state_aura.h" |
| 11 #include "ash/wm_shell.h" |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "chrome/browser/ui/ash/ash_util.h" | 15 #include "chrome/browser/ui/ash/ash_util.h" |
| 16 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
| 17 #include "ui/display/screen.h" | 17 #include "ui/display/screen.h" |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 void ProcessAcceleratorNow(const ui::Accelerator& accelerator) { | 21 void ProcessAcceleratorNow(const ui::Accelerator& accelerator) { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 params->context = params->context->GetRootWindow(); | 87 params->context = params->context->GetRootWindow(); |
| 88 DCHECK(params->parent || params->context || !params->child) | 88 DCHECK(params->parent || params->context || !params->child) |
| 89 << "Please provide a parent or context for this widget."; | 89 << "Please provide a parent or context for this widget."; |
| 90 if (!params->parent && !params->context) | 90 if (!params->parent && !params->context) |
| 91 params->context = ash::Shell::GetPrimaryRootWindow(); | 91 params->context = ash::Shell::GetPrimaryRootWindow(); |
| 92 | 92 |
| 93 // By returning null Widget creates the default NativeWidget implementation, | 93 // By returning null Widget creates the default NativeWidget implementation, |
| 94 // which for chromeos is NativeWidgetAura. | 94 // which for chromeos is NativeWidgetAura. |
| 95 return nullptr; | 95 return nullptr; |
| 96 } | 96 } |
| OLD | NEW |