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

Unified Diff: ash/shell.h

Issue 12375004: Re-home the global MessageCenter to support Ash+Win environments. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master. Created 7 years, 10 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 | « no previous file | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 5ed4cd79a91721cf62c375ceaca71c194447c3e5..c2cdda6a44c5dfbd4899e696ce8b423ec76d77a0 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -64,10 +64,6 @@ class WindowModalityController;
}
}
-namespace message_center {
-class MessageCenter;
-}
-
namespace ash {
class AcceleratorController;
@@ -444,9 +440,6 @@ class ASH_EXPORT Shell
return root_window_host_factory_.get();
}
- // MessageCenter is a global list of currently displayed notifications.
- message_center::MessageCenter* message_center();
-
private:
FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
@@ -589,8 +582,6 @@ class ASH_EXPORT Shell
scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
#endif // defined(OS_CHROMEOS)
- scoped_ptr<message_center::MessageCenter> message_center_;
-
// |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
// pointer to vend to test code.
AshNativeCursorManager* native_cursor_manager_;
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698