Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge again Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5bb30c170062b746f6ad552126b6ae628e2ea0b4..81133c1bf939bbf3878502f9fa1488f1c8e97554 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,12 +19,15 @@
#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"
@@ -35,7 +38,9 @@
#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
#endif // defined(OS_CHROMEOS)
-ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
+ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh(
+ ChromeBrowserMainExtraPartsViews* extra_parts_views)
+ : extra_parts_views_(extra_parts_views) {}
ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
@@ -44,7 +49,8 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
chrome::OpenAsh(gfx::kNullAcceleratedWidget);
if (chrome::IsRunningInMash()) {
- immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
+ immersive_context_ = base::MakeUnique<ImmersiveContextMus>(
+ extra_parts_views_->wm_state()->capture_controller());
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
}

Powered by Google App Engine
This is Rietveld 408576698