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

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

Issue 754473003: [Extensions Toolbar Mac] More cleanup of BrowserActionsController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "chrome/browser/extensions/extension_keybinding_registry.h" 9 #include "chrome/browser/extensions/extension_keybinding_registry.h"
10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 // The painter used when we are highlighting a subset of extensions. 314 // The painter used when we are highlighting a subset of extensions.
315 scoped_ptr<views::Painter> highlight_painter_; 315 scoped_ptr<views::Painter> highlight_painter_;
316 316
317 // The animation that happens when the container snaps to place. 317 // The animation that happens when the container snaps to place.
318 scoped_ptr<gfx::SlideAnimation> resize_animation_; 318 scoped_ptr<gfx::SlideAnimation> resize_animation_;
319 319
320 // Don't show the chevron while animating. 320 // Don't show the chevron while animating.
321 bool suppress_chevron_; 321 bool suppress_chevron_;
322 322
323 // True if the container has been added to the parent view.
324 bool added_to_view_;
325
323 // This is used while the user is resizing (and when the animations are in 326 // This is used while the user is resizing (and when the animations are in
324 // progress) to know how wide the delta is between the current state and what 327 // progress) to know how wide the delta is between the current state and what
325 // we should draw. 328 // we should draw.
326 int resize_amount_; 329 int resize_amount_;
327 330
328 // Keeps track of the absolute pixel width the container should have when we 331 // Keeps track of the absolute pixel width the container should have when we
329 // are done animating. 332 // are done animating.
330 int animation_target_size_; 333 int animation_target_size_;
331 334
332 // The DropPosition for the current drag-and-drop operation, or NULL if there 335 // The DropPosition for the current drag-and-drop operation, or NULL if there
333 // is none. 336 // is none.
334 scoped_ptr<DropPosition> drop_position_; 337 scoped_ptr<DropPosition> drop_position_;
335 338
336 // The class that registers for keyboard shortcuts for extension commands. 339 // The class that registers for keyboard shortcuts for extension commands.
337 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 340 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
338 341
339 ObserverList<BrowserActionsContainerObserver> observers_; 342 ObserverList<BrowserActionsContainerObserver> observers_;
340 343
341 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 344 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
342 }; 345 };
343 346
344 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 347 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698