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

Unified Diff: chrome/browser/ui/ash/launcher/settings_window_observer.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/ash/launcher/settings_window_observer.h
diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.h b/chrome/browser/ui/ash/launcher/settings_window_observer.h
index fcb2f04fcc6fdb7d48054bf1ec5e34b486286d98..5bbebbc717c6b544d3c6e46201a537d7dcbd5e0d 100644
--- a/chrome/browser/ui/ash/launcher/settings_window_observer.h
+++ b/chrome/browser/ui/ash/launcher/settings_window_observer.h
@@ -5,10 +5,9 @@
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_SETTINGS_WINDOW_OBSERVER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_SETTINGS_WINDOW_OBSERVER_H_
-#include <memory>
-
#include "base/macros.h"
#include "chrome/browser/ui/settings_window_manager_observer.h"
+#include "services/ui/public/cpp/window_tracker.h"
#include "ui/aura/window_tracker.h"
// Sets the window title and shelf item properties for settings windows.
@@ -22,8 +21,9 @@
void OnNewSettingsWindow(Browser* settings_browser) override;
private:
- // Set of windows whose title is forced to 'Settings.'
+ // Window trackers that rename the Settings window in classic ash and mash.
std::unique_ptr<aura::WindowTracker> aura_window_tracker_;
+ std::unique_ptr<ui::WindowTracker> ui_window_tracker_;
DISALLOW_COPY_AND_ASSIGN(SettingsWindowObserver);
};

Powered by Google App Engine
This is Rietveld 408576698