| OLD | NEW | 
|    1 // Copyright 2016 The Chromium Authors. All rights reserved. |    1 // Copyright 2016 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/sysui/sysui_application.h" |    5 #include "ash/sysui/sysui_application.h" | 
|    6  |    6  | 
|    7 #include <map> |    7 #include <map> | 
|    8 #include <set> |    8 #include <set> | 
|    9 #include <string> |    9 #include <string> | 
|   10 #include <vector> |   10 #include <vector> | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  198     return native_widget; |  198     return native_widget; | 
|  199   } |  199   } | 
|  200  |  200  | 
|  201   DISALLOW_COPY_AND_ASSIGN(NativeWidgetFactory); |  201   DISALLOW_COPY_AND_ASSIGN(NativeWidgetFactory); | 
|  202 }; |  202 }; | 
|  203  |  203  | 
|  204 }  // namespace |  204 }  // namespace | 
|  205  |  205  | 
|  206 class AshInit { |  206 class AshInit { | 
|  207  public: |  207  public: | 
|  208   AshInit() : worker_pool_(new base::SequencedWorkerPool(2, "AshWorkerPool")) { |  208   AshInit() | 
 |  209       : worker_pool_( | 
 |  210             new base::SequencedWorkerPool(2, | 
 |  211                                           "AshWorkerPool", | 
 |  212                                           base::TaskPriority::USER_BLOCKING)) { | 
|  209     ui::RegisterPathProvider(); |  213     ui::RegisterPathProvider(); | 
|  210   } |  214   } | 
|  211  |  215  | 
|  212   ~AshInit() { worker_pool_->Shutdown(); } |  216   ~AshInit() { worker_pool_->Shutdown(); } | 
|  213  |  217  | 
|  214   aura::Window* root() { return Shell::GetPrimaryRootWindow(); } |  218   aura::Window* root() { return Shell::GetPrimaryRootWindow(); } | 
|  215  |  219  | 
|  216   void Initialize(::shell::Connector* connector, |  220   void Initialize(::shell::Connector* connector, | 
|  217                   const ::shell::Identity& identity) { |  221                   const ::shell::Identity& identity) { | 
|  218     InitializeResourceBundle(connector); |  222     InitializeResourceBundle(connector); | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  337                               mojom::WallpaperControllerRequest request) { |  341                               mojom::WallpaperControllerRequest request) { | 
|  338   mojom::WallpaperController* wallpaper_controller = |  342   mojom::WallpaperController* wallpaper_controller = | 
|  339       static_cast<UserWallpaperDelegateMus*>( |  343       static_cast<UserWallpaperDelegateMus*>( | 
|  340           Shell::GetInstance()->user_wallpaper_delegate()); |  344           Shell::GetInstance()->user_wallpaper_delegate()); | 
|  341   wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |  345   wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 
|  342                                             std::move(request)); |  346                                             std::move(request)); | 
|  343 } |  347 } | 
|  344  |  348  | 
|  345 }  // namespace sysui |  349 }  // namespace sysui | 
|  346 }  // namespace ash |  350 }  // namespace ash | 
| OLD | NEW |