chrome/browser/ui/views/browser_actions_container.h - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Retrying upload after AppEngine error Created 9 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

« base/sys_info_win.cc ('K') | « chrome/browser/ui/views/bookmark_menu_controller_views.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | chrome/browser/ui/views/tabs/dragged_tab_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 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 "app/animation_delegate.h"	13 #include "app/animation_delegate.h"

14 #include "app/tween.h"	14 #include "app/tween.h"

15 #include "base/task.h"	15 #include "base/task.h"

16 #include "chrome/browser/extensions/extension_context_menu_model.h"	16 #include "chrome/browser/extensions/extension_context_menu_model.h"

17 #include "chrome/browser/extensions/extension_toolbar_model.h"	17 #include "chrome/browser/extensions/extension_toolbar_model.h"

18 #include "chrome/browser/extensions/image_loading_tracker.h"	18 #include "chrome/browser/extensions/image_loading_tracker.h"

19 #include "chrome/browser/views/browser_bubble.h"	19 #include "chrome/browser/ui/views/browser_bubble.h"

20 #include "chrome/browser/views/extensions/browser_action_overflow_menu_controlle r.h"	20 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"

21 #include "chrome/browser/views/extensions/extension_popup.h"	21 #include "chrome/browser/ui/views/extensions/extension_popup.h"

22 #include "chrome/common/notification_observer.h"	22 #include "chrome/common/notification_observer.h"

23 #include "chrome/common/notification_registrar.h"	23 #include "chrome/common/notification_registrar.h"

24 #include "views/controls/button/menu_button.h"	24 #include "views/controls/button/menu_button.h"

25 #include "views/controls/menu/view_menu_delegate.h"	25 #include "views/controls/menu/view_menu_delegate.h"

26 #include "views/controls/resize_area.h"	26 #include "views/controls/resize_area.h"

27 #include "views/view.h"	27 #include "views/view.h"

28	28

29 class Browser;	29 class Browser;

30 class BrowserActionsContainer;	30 class BrowserActionsContainer;

31 class BrowserActionOverflowMenuController;	31 class BrowserActionOverflowMenuController;

(...skipping 470 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
502	502

503 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;	503 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;

504	504

505 // Handles delayed showing of the overflow menu when hovering.	505 // Handles delayed showing of the overflow menu when hovering.

506 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;	506 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;

507	507

508 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);	508 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);

509 };	509 };

510	510

511 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_	511 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_

OLD	NEW