summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h4
-rw-r--r--chrome/browser/ui/views/status_bubble_views.cc8
-rw-r--r--chrome/browser/ui/webui/signin/user_manager_screen_handler.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
index 1e0df0a..d4a8efe 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
@@ -170,11 +170,11 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
base::CancelableTaskTracker local_tab_cancelable_task_tracker_;
base::CancelableTaskTracker other_devices_tab_cancelable_task_tracker_;
- base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
-
// Time the menu is open for until a recent tab is selected.
base::ElapsedTimer menu_opened_timer_;
+ base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel);
};
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 6eb3b92..96d5061 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -173,8 +173,6 @@ class StatusBubbleViews::StatusView : public views::View {
BubbleState state_;
BubbleStyle style_;
- base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
-
scoped_ptr<StatusViewAnimation> animation_;
// Handle to the widget that contains us.
@@ -186,6 +184,8 @@ class StatusBubbleViews::StatusView : public views::View {
// Holds the theme provider of the frame that created us.
ui::ThemeProvider* theme_service_;
+ base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
+
DISALLOW_COPY_AND_ASSIGN(StatusView);
};
@@ -193,10 +193,10 @@ StatusBubbleViews::StatusView::StatusView(views::Widget* popup,
ui::ThemeProvider* theme_provider)
: state_(BUBBLE_HIDDEN),
style_(STYLE_STANDARD),
- timer_factory_(this),
animation_(new StatusViewAnimation(this, 0, 0)),
popup_(popup),
- theme_service_(theme_provider) {
+ theme_service_(theme_provider),
+ timer_factory_(this) {
}
StatusBubbleViews::StatusView::~StatusView() {
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
index eb04e1f5..d1b5c2b 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
@@ -119,10 +119,10 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler,
UserAuthTypeMap;
UserAuthTypeMap user_auth_type_map_;
- base::WeakPtrFactory<UserManagerScreenHandler> weak_ptr_factory_;
-
content::NotificationRegistrar registrar_;
+ base::WeakPtrFactory<UserManagerScreenHandler> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(UserManagerScreenHandler);
};