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

Unified Diff: ui/aura/test/aura_test_base.h

Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « ui/aura/root_window_host_linux.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.h
===================================================================
--- ui/aura/test/aura_test_base.h (revision 124527)
+++ ui/aura/test/aura_test_base.h (working copy)
@@ -30,11 +30,11 @@
protected:
void RunAllPendingInMessageLoop();
- RootWindow* root_window() { return root_window_; }
+ RootWindow* root_window() { return root_window_.get(); }
private:
AuraTestHelper helper_;
- RootWindow* root_window_;
+ scoped_ptr<RootWindow> root_window_;
scoped_ptr<TestStackingClient> stacking_client_;
DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
« no previous file with comments | « ui/aura/root_window_host_linux.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698