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

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

Issue 10412052: Pull browser action click logic into ToolbarModelController, so that when I (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 // the target size). This also saves the target number of visible icons in 462 // the target size). This also saves the target number of visible icons in
463 // the pref if we're not incognito. 463 // the pref if we're not incognito.
464 void SaveDesiredSizeAndAnimate(ui::Tween::Type type, 464 void SaveDesiredSizeAndAnimate(ui::Tween::Type type,
465 size_t num_visible_icons); 465 size_t num_visible_icons);
466 466
467 // Returns true if this extension should be shown in this toolbar. This can 467 // Returns true if this extension should be shown in this toolbar. This can
468 // return false if we are in an incognito window and the extension is disabled 468 // return false if we are in an incognito window and the extension is disabled
469 // for incognito. 469 // for incognito.
470 bool ShouldDisplayBrowserAction(const extensions::Extension* extension); 470 bool ShouldDisplayBrowserAction(const extensions::Extension* extension);
471 471
472 // Show a popup.
473 void ShowPopup(BrowserActionButton* button, const GURL& popup_url);
474
472 // The vector of browser actions (icons/image buttons for each action). Note 475 // The vector of browser actions (icons/image buttons for each action). Note
473 // that not every BrowserAction in the ToolbarModel will necessarily be in 476 // that not every BrowserAction in the ToolbarModel will necessarily be in
474 // this collection. Some extensions may be disabled in incognito windows. 477 // this collection. Some extensions may be disabled in incognito windows.
475 BrowserActionViews browser_action_views_; 478 BrowserActionViews browser_action_views_;
476 479
477 Profile* profile_; 480 Profile* profile_;
478 481
479 // The Browser object the container is associated with. 482 // The Browser object the container is associated with.
480 Browser* browser_; 483 Browser* browser_;
481 484
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 531
529 base::WeakPtrFactory<BrowserActionsContainer> task_factory_; 532 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
530 533
531 // Handles delayed showing of the overflow menu when hovering. 534 // Handles delayed showing of the overflow menu when hovering.
532 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 535 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
533 536
534 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 537 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
535 }; 538 };
536 539
537 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 540 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698