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/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/threading/sequenced_worker_pool.h" |
15 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
16 #include "base/time/time.h" | 17 #include "base/time/time.h" |
17 #include "build/build_config.h" | 18 #include "build/build_config.h" |
18 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/lifetime/keep_alive_types.h" | 20 #include "chrome/browser/lifetime/keep_alive_types.h" |
20 #include "chrome/browser/lifetime/scoped_keep_alive.h" | 21 #include "chrome/browser/lifetime/scoped_keep_alive.h" |
21 #include "chrome/browser/profiles/profile_manager.h" | 22 #include "chrome/browser/profiles/profile_manager.h" |
22 #include "chrome/browser/ui/ash/ash_util.h" | 23 #include "chrome/browser/ui/ash/ash_util.h" |
23 #include "chrome/browser/ui/browser_window_state.h" | 24 #include "chrome/browser/ui/browser_window_state.h" |
24 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h" | 25 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h" |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN)); | 578 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN)); |
578 } | 579 } |
579 | 580 |
580 #if !defined(USE_ASH) | 581 #if !defined(USE_ASH) |
581 views::Widget::InitParams::WindowOpacity | 582 views::Widget::InitParams::WindowOpacity |
582 ChromeViewsDelegate::GetOpacityForInitParams( | 583 ChromeViewsDelegate::GetOpacityForInitParams( |
583 const views::Widget::InitParams& params) { | 584 const views::Widget::InitParams& params) { |
584 return views::Widget::InitParams::OPAQUE_WINDOW; | 585 return views::Widget::InitParams::OPAQUE_WINDOW; |
585 } | 586 } |
586 #endif | 587 #endif |
OLD | NEW |