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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.h

Issue 577523002: Refactoring the WeakPtrFactory initialization in chrome/browser/ui/views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved Rebase issues Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_message_bubble_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "chrome/browser/extensions/extension_keybinding_registry.h" 9 #include "chrome/browser/extensions/extension_keybinding_registry.h"
10 #include "chrome/browser/extensions/extension_toolbar_model.h" 10 #include "chrome/browser/extensions/extension_toolbar_model.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 // are done animating. 417 // are done animating.
418 int animation_target_size_; 418 int animation_target_size_;
419 419
420 // The DropPosition for the current drag-and-drop operation, or NULL if there 420 // The DropPosition for the current drag-and-drop operation, or NULL if there
421 // is none. 421 // is none.
422 scoped_ptr<DropPosition> drop_position_; 422 scoped_ptr<DropPosition> drop_position_;
423 423
424 // The class that registers for keyboard shortcuts for extension commands. 424 // The class that registers for keyboard shortcuts for extension commands.
425 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 425 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
426 426
427 // Handles delayed showing of the overflow menu when hovering.
428 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
429
430 ObserverList<BrowserActionsContainerObserver> observers_; 427 ObserverList<BrowserActionsContainerObserver> observers_;
431 428
432 // The maximum number of icons to show per row when in overflow mode (showing 429 // The maximum number of icons to show per row when in overflow mode (showing
433 // icons in the application menu). 430 // icons in the application menu).
434 static int icons_per_overflow_menu_row_; 431 static int icons_per_overflow_menu_row_;
435 432
433 // Handles delayed showing of the overflow menu when hovering.
434 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
435
436 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 436 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
437 }; 437 };
438 438
439 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 439 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_message_bubble_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698