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

Unified Diff: ash/shelf/shelf_view.h

Issue 2194353002: mash: Migrate ScopedTargetRootWindow to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: non-virtual Created 4 years, 4 months 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
« no previous file with comments | « ash/scoped_target_root_window.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 8af3d1e4882ceaef8a3df332948e784c3b0fe990..9b8e1122da2ed326492de35aece0ad732be597bf 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -42,7 +42,7 @@ class AppListButton;
class DragImageView;
class OverflowBubble;
class OverflowButton;
-class ScopedTargetRootWindow;
+class ScopedRootWindowForNewWindows;
class Shelf;
class ShelfButton;
class ShelfDelegate;
@@ -397,7 +397,8 @@ class ASH_EXPORT ShelfView : public views::View,
std::unique_ptr<ui::MenuModel> menu_model_;
std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
std::unique_ptr<views::MenuRunner> launcher_menu_runner_;
- std::unique_ptr<ScopedTargetRootWindow> scoped_target_root_window_;
+ std::unique_ptr<ScopedRootWindowForNewWindows>
+ scoped_root_window_for_new_windows_;
base::ObserverList<ShelfIconObserver> observers_;
« no previous file with comments | « ash/scoped_target_root_window.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698