| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| index 81133c1bf939bbf3878502f9fa1488f1c8e97554..5bb30c170062b746f6ad552126b6ae628e2ea0b4 100644
|
| --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| @@ -19,15 +19,12 @@
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
|
| #include "chrome/browser/ui/ash/media_client.h"
|
| #include "chrome/browser/ui/views/ash/tab_scrubber.h"
|
| -#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
|
| #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
|
| #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/keyboard/content/keyboard.h"
|
| #include "ui/keyboard/keyboard_controller.h"
|
| -#include "ui/wm/core/capture_controller.h"
|
| -#include "ui/wm/core/wm_state.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/ui/ash/session_controller_client.h"
|
| @@ -38,9 +35,7 @@
|
| #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| -ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh(
|
| - ChromeBrowserMainExtraPartsViews* extra_parts_views)
|
| - : extra_parts_views_(extra_parts_views) {}
|
| +ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
|
|
|
| ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
|
|
|
| @@ -49,8 +44,7 @@
|
| chrome::OpenAsh(gfx::kNullAcceleratedWidget);
|
|
|
| if (chrome::IsRunningInMash()) {
|
| - immersive_context_ = base::MakeUnique<ImmersiveContextMus>(
|
| - extra_parts_views_->wm_state()->capture_controller());
|
| + immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
|
| immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
|
| }
|
|
|
|
|