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

Unified Diff: ash/shell.h

Issue 497733002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes are incorporated with the comments Created 6 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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 7d5ab3b680ae1f725e3e66a424752d5bc5b55a7f..393aa14cd2fbc70fbf8471110b19ed82e7628169 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -698,10 +698,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// An event filter that pre-handles all key events to send them to an IME.
scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
- scoped_ptr<DisplayManager> display_manager_;
- scoped_ptr<base::WeakPtrFactory<DisplayManager> >
- weak_display_manager_factory_;
-
scoped_ptr<LocaleNotificationController> locale_notification_controller_;
scoped_ptr<AccelerometerController> accelerometer_controller_;
@@ -758,6 +754,11 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// Injected content::GPUDataManager support.
scoped_ptr<GPUSupport> gpu_support_;
+ scoped_ptr<DisplayManager> display_manager_;
+
+ scoped_ptr<base::WeakPtrFactory<DisplayManager> >
+ weak_display_manager_factory_;
oshima 2014/08/28 06:33:17 sorry if I wasn't clear. Please keep them as it wa
Anand Ratn (left samsung) 2014/08/28 07:17:39 Sorry I misunderstood it previously. keeping it as
+
DISALLOW_COPY_AND_ASSIGN(Shell);
};

Powered by Google App Engine
This is Rietveld 408576698