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

Unified Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h

Issue 2577963006: Revert of Converts chrome to aura-mus (Closed)
Patch Set: 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/chrome_browser_main_extra_parts_views.h
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
index 32665d8235f52b15598f1300110768df18cf4035..195f7996f5e9de0be96a92300fc160967c97186e 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h
@@ -16,12 +16,10 @@
namespace views {
class ViewsDelegate;
+class WindowManagerConnection;
}
#if defined(USE_AURA)
-namespace views {
-class MusClient;
-}
namespace wm {
class WMState;
}
@@ -31,10 +29,6 @@
public:
ChromeBrowserMainExtraPartsViews();
~ChromeBrowserMainExtraPartsViews() override;
-
-#if defined(USE_AURA)
- wm::WMState* wm_state() { return wm_state_.get(); }
-#endif
// Overridden from ChromeBrowserMainExtraParts:
void ToolkitInitialized() override;
@@ -48,7 +42,7 @@
#if defined(USE_AURA)
std::unique_ptr<wm::WMState> wm_state_;
- std::unique_ptr<views::MusClient> mus_client_;
+ std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
// Subscribes to updates about input-devices.
std::unique_ptr<ui::InputDeviceClient> input_device_client_;

Powered by Google App Engine
This is Rietveld 408576698