chrome/browser/ui/views/toolbar/browser_actions_container.h - Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory.

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

Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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

« chrome/browser/chromeos/login/DEPS ('K') | « chrome/browser/ui/views/toolbar/browser_action_view.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | chrome/browser/ui/views/toolbar/wrench_toolbar_button.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_

6 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_	6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_

7	7

8 #include "chrome/browser/extensions/extension_keybinding_registry.h"	8 #include "chrome/browser/extensions/extension_keybinding_registry.h"

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

10 #include "chrome/browser/ui/views/browser_action_view.h"

11 #include "chrome/browser/ui/views/chrome_views_export.h"	10 #include "chrome/browser/ui/views/chrome_views_export.h"

12 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"	11 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"

13 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"	12 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"

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

	14 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"

15 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

16 #include "ui/gfx/animation/animation_delegate.h"	16 #include "ui/gfx/animation/animation_delegate.h"

17 #include "ui/gfx/animation/tween.h"	17 #include "ui/gfx/animation/tween.h"

18 #include "ui/views/controls/button/menu_button.h"	18 #include "ui/views/controls/button/menu_button.h"

19 #include "ui/views/controls/button/menu_button_listener.h"	19 #include "ui/views/controls/button/menu_button_listener.h"

20 #include "ui/views/controls/resize_area_delegate.h"	20 #include "ui/views/controls/resize_area_delegate.h"

21 #include "ui/views/drag_controller.h"	21 #include "ui/views/drag_controller.h"

22 #include "ui/views/view.h"	22 #include "ui/views/view.h"

23 #include "ui/views/widget/widget_observer.h"	23 #include "ui/views/widget/widget_observer.h"

24	24

(...skipping 351 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
376 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;	376 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;

377	377

378 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;	378 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;

379	379

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

381 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;	381 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;

382	382

383 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);	383 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);

384 };	384 };

385	385

386 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_	386 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_

OLD	NEW