chrome/browser/ui/views/browser_actions_container.h - Issue 12256040: Second batch of fixing prefs registrations.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12256040: Second batch of fixing prefs registrations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head for commit. Created 7 years, 10 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

« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »

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_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	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"	10 #include "chrome/browser/ui/views/browser_action_view.h"

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

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

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

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

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

15 #include "ui/base/animation/animation_delegate.h"	16 #include "ui/base/animation/animation_delegate.h"

16 #include "ui/base/animation/tween.h"	17 #include "ui/base/animation/tween.h"

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

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

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

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

(...skipping 351 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
372	373

373 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;	374 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;

374	375

375 // Handles delayed showing of the overflow menu when hovering.	376 // Handles delayed showing of the overflow menu when hovering.

376 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;	377 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;

377	378

378 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);	379 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);

379 };	380 };

380	381

381 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_	382 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_

OLD	NEW