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_browser_main_extra_parts_views.h" | 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" | 8 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" |
8 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 9 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
9 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h" | 10 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h" |
10 #include "components/constrained_window/constrained_window_views.h" | 11 #include "components/constrained_window/constrained_window_views.h" |
11 | 12 |
12 #if defined(USE_AURA) | 13 #if defined(USE_AURA) |
13 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
14 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/common/service_manager_connection.h" | 16 #include "content/public/common/service_manager_connection.h" |
16 #include "services/service_manager/public/cpp/connector.h" | 17 #include "services/service_manager/public/cpp/connector.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // WMState is owned as a member, so don't have MusClient create it. | 117 // WMState is owned as a member, so don't have MusClient create it. |
117 const bool create_wm_state = false; | 118 const bool create_wm_state = false; |
118 mus_client_ = base::MakeUnique<views::MusClient>( | 119 mus_client_ = base::MakeUnique<views::MusClient>( |
119 connection->GetConnector(), connection->GetIdentity(), | 120 connection->GetConnector(), connection->GetIdentity(), |
120 content::BrowserThread::GetTaskRunnerForThread( | 121 content::BrowserThread::GetTaskRunnerForThread( |
121 content::BrowserThread::IO), | 122 content::BrowserThread::IO), |
122 create_wm_state); | 123 create_wm_state); |
123 } | 124 } |
124 #endif // defined(USE_AURA) | 125 #endif // defined(USE_AURA) |
125 } | 126 } |
OLD | NEW |