Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index 7d5ab3b680ae1f725e3e66a424752d5bc5b55a7f..588f27b7c768e07a61853a61461839a5327fb26a 100644 |
--- a/ash/shell.h |
+++ b/ash/shell.h |
@@ -699,8 +699,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; |
scoped_ptr<DisplayManager> display_manager_; |
- scoped_ptr<base::WeakPtrFactory<DisplayManager> > |
- weak_display_manager_factory_; |
oshima
2014/08/26 15:31:05
This is for display_manager_, and defined after di
dmichael (off chromium)
2014/08/26 15:34:52
It should be safe this way, and I think the Clang
Anand Ratn (left samsung)
2014/08/28 06:15:07
Done.
Anand Ratn (left samsung)
2014/08/28 06:15:07
Maintaining the order of display_manager_ in the n
|
scoped_ptr<LocaleNotificationController> locale_notification_controller_; |
@@ -758,6 +756,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
// Injected content::GPUDataManager support. |
scoped_ptr<GPUSupport> gpu_support_; |
+ scoped_ptr<base::WeakPtrFactory<DisplayManager> > |
+ weak_display_manager_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(Shell); |
}; |