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

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

Issue 539543002: Fix two bugs in the extension actions toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | chrome/browser/ui/views/toolbar/browser_actions_container.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 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/extensions/extension_toolbar_model.h" 10 #include "chrome/browser/extensions/extension_toolbar_model.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 bool grant_active_tab) OVERRIDE; 288 bool grant_active_tab) OVERRIDE;
289 virtual void ToolbarVisibleCountChanged() OVERRIDE; 289 virtual void ToolbarVisibleCountChanged() OVERRIDE;
290 virtual void ToolbarHighlightModeChanged(bool is_highlighting) OVERRIDE; 290 virtual void ToolbarHighlightModeChanged(bool is_highlighting) OVERRIDE;
291 virtual Browser* GetBrowser() OVERRIDE; 291 virtual Browser* GetBrowser() OVERRIDE;
292 292
293 void LoadImages(); 293 void LoadImages();
294 294
295 // Called when a browser action's visibility may have changed. 295 // Called when a browser action's visibility may have changed.
296 void OnBrowserActionVisibilityChanged(); 296 void OnBrowserActionVisibilityChanged();
297 297
298 // Sets the initial container width. 298 // Returns the preferred width of the container in order to show all icons
299 void SetContainerWidth(); 299 // that should be visible and, optionally, the chevron.
300 int GetPreferredWidth();
301
302 // Sets the chevron to be visible or not based on whether all browser actions
303 // are displayed.
304 void SetChevronVisibility();
300 305
301 // Closes the overflow menu if open. 306 // Closes the overflow menu if open.
302 void CloseOverflowMenu(); 307 void CloseOverflowMenu();
303 308
304 // Cancels the timer for showing the drop down menu. 309 // Cancels the timer for showing the drop down menu.
305 void StopShowFolderDropMenuTimer(); 310 void StopShowFolderDropMenuTimer();
306 311
307 // Show the drop down folder after a slight delay. 312 // Show the drop down folder after a slight delay.
308 void StartShowFolderDropMenuTimer(); 313 void StartShowFolderDropMenuTimer();
309 314
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 417
413 // Handles delayed showing of the overflow menu when hovering. 418 // Handles delayed showing of the overflow menu when hovering.
414 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 419 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
415 420
416 ObserverList<BrowserActionsContainerObserver> observers_; 421 ObserverList<BrowserActionsContainerObserver> observers_;
417 422
418 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 423 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
419 }; 424 };
420 425
421 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 426 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698