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

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

Issue 9034029: Revert 115997 - Replace MessageLoop::DeleteSoon implementation with one that uses base::Bind. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/message_loop_helpers.h"
17 #include "chrome/browser/extensions/extension_context_menu_model.h" 16 #include "chrome/browser/extensions/extension_context_menu_model.h"
18 #include "chrome/browser/extensions/extension_toolbar_model.h" 17 #include "chrome/browser/extensions/extension_toolbar_model.h"
19 #include "chrome/browser/extensions/image_loading_tracker.h" 18 #include "chrome/browser/extensions/image_loading_tracker.h"
20 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h" 19 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"
21 #include "chrome/browser/ui/views/extensions/extension_popup.h" 20 #include "chrome/browser/ui/views/extensions/extension_popup.h"
22 #include "content/public/browser/notification_observer.h" 21 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 22 #include "content/public/browser/notification_registrar.h"
24 #include "ui/base/animation/animation_delegate.h" 23 #include "ui/base/animation/animation_delegate.h"
25 #include "ui/base/animation/tween.h" 24 #include "ui/base/animation/tween.h"
26 #include "ui/views/controls/button/menu_button.h" 25 #include "ui/views/controls/button/menu_button.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 SkBitmap default_icon_; 133 SkBitmap default_icon_;
135 134
136 // The browser action shelf. 135 // The browser action shelf.
137 BrowserActionsContainer* panel_; 136 BrowserActionsContainer* panel_;
138 137
139 // The context menu. This member is non-NULL only when the menu is shown. 138 // The context menu. This member is non-NULL only when the menu is shown.
140 views::MenuItemView* context_menu_; 139 views::MenuItemView* context_menu_;
141 140
142 content::NotificationRegistrar registrar_; 141 content::NotificationRegistrar registrar_;
143 142
144 friend class base::DeleteHelper<BrowserActionButton>; 143 friend class DeleteTask<BrowserActionButton>;
145 144
146 DISALLOW_COPY_AND_ASSIGN(BrowserActionButton); 145 DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
147 }; 146 };
148 147
149 148
150 //////////////////////////////////////////////////////////////////////////////// 149 ////////////////////////////////////////////////////////////////////////////////
151 // BrowserActionView 150 // BrowserActionView
152 // A single section in the browser action container. This contains the actual 151 // A single section in the browser action container. This contains the actual
153 // BrowserActionButton, as well as the logic to paint the badge. 152 // BrowserActionButton, as well as the logic to paint the badge.
154 153
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 514
516 base::WeakPtrFactory<BrowserActionsContainer> task_factory_; 515 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
517 516
518 // Handles delayed showing of the overflow menu when hovering. 517 // Handles delayed showing of the overflow menu when hovering.
519 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 518 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
520 519
521 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 520 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
522 }; 521 };
523 522
524 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 523 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698