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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.h

Issue 1781593005: Fix regression in dragging location bar right edge (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_extensions_buttons
Patch Set: Created 4 years, 9 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/layout_constants.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // next to the omnibox, and the overflow bar is visible inside the chrome 45 // next to the omnibox, and the overflow bar is visible inside the chrome
46 // app menu. The main bar can have only a single row of icons with flexible 46 // app menu. The main bar can have only a single row of icons with flexible
47 // width, whereas the overflow bar has multiple rows of icons with a fixed 47 // width, whereas the overflow bar has multiple rows of icons with a fixed
48 // width (the width of the menu). 48 // width (the width of the menu).
49 class ToolbarActionsBar : public ToolbarActionsModel::Observer { 49 class ToolbarActionsBar : public ToolbarActionsModel::Observer {
50 public: 50 public:
51 // A struct to contain the platform settings. 51 // A struct to contain the platform settings.
52 struct PlatformSettings { 52 struct PlatformSettings {
53 PlatformSettings(); 53 PlatformSettings();
54 54
55 // The spacing between each of the icons, between the start of the 55 // The spacing between each of the icons.
56 // container and the first item, and between the last item and end of
57 // the container.
58 int item_spacing; 56 int item_spacing;
57 // The space between the start of the container and the first item.
58 int left_padding;
59 // The space between the last item and the end of the container.
60 int right_padding;
59 // The number of icons per row in the overflow menu. 61 // The number of icons per row in the overflow menu.
60 int icons_per_overflow_menu_row; 62 int icons_per_overflow_menu_row;
61 // Whether or not the overflow menu is displayed as a chevron (this is being 63 // Whether or not the overflow menu is displayed as a chevron (this is being
62 // phased out). 64 // phased out).
63 bool chevron_enabled; 65 bool chevron_enabled;
64 }; 66 };
65 67
66 // The type of drag that occurred in a drag-and-drop operation. 68 // The type of drag that occurred in a drag-and-drop operation.
67 enum DragType { 69 enum DragType {
68 // The icon was dragged to the same container it started in. 70 // The icon was dragged to the same container it started in.
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 pending_extension_bubble_controller_; 336 pending_extension_bubble_controller_;
335 337
336 base::ObserverList<ToolbarActionsBarObserver> observers_; 338 base::ObserverList<ToolbarActionsBarObserver> observers_;
337 339
338 base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_; 340 base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_;
339 341
340 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar); 342 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
341 }; 343 };
342 344
343 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 345 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/layout_constants.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698