OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 54 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
55 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 55 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
56 #include "ui/views/widget/native_widget_aura.h" | 56 #include "ui/views/widget/native_widget_aura.h" |
57 #endif | 57 #endif |
58 | 58 |
59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
60 #include "ui/views/linux_ui/linux_ui.h" | 60 #include "ui/views/linux_ui/linux_ui.h" |
61 #endif | 61 #endif |
62 | 62 |
63 #if defined(USE_ASH) | 63 #if defined(USE_ASH) |
64 #include "ash/accelerators/accelerator_controller.h" | 64 #include "ash/common/accelerators/accelerator_controller.h" |
65 #include "ash/common/wm/window_state.h" | 65 #include "ash/common/wm/window_state.h" |
66 #include "ash/shell.h" | 66 #include "ash/shell.h" |
67 #include "ash/wm/window_state_aura.h" | 67 #include "ash/wm/window_state_aura.h" |
68 #include "chrome/browser/ui/ash/ash_init.h" | 68 #include "chrome/browser/ui/ash/ash_init.h" |
69 #endif | 69 #endif |
70 | 70 |
71 // Helpers -------------------------------------------------------------------- | 71 // Helpers -------------------------------------------------------------------- |
72 | 72 |
73 namespace { | 73 namespace { |
74 | 74 |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 return content::BrowserThread::GetBlockingPool(); | 505 return content::BrowserThread::GetBlockingPool(); |
506 } | 506 } |
507 | 507 |
508 #if !defined(USE_ASH) | 508 #if !defined(USE_ASH) |
509 views::Widget::InitParams::WindowOpacity | 509 views::Widget::InitParams::WindowOpacity |
510 ChromeViewsDelegate::GetOpacityForInitParams( | 510 ChromeViewsDelegate::GetOpacityForInitParams( |
511 const views::Widget::InitParams& params) { | 511 const views::Widget::InitParams& params) { |
512 return views::Widget::InitParams::OPAQUE_WINDOW; | 512 return views::Widget::InitParams::OPAQUE_WINDOW; |
513 } | 513 } |
514 #endif | 514 #endif |
OLD | NEW |