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

Side by Side Diff: trunk/src/chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 416903002: Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 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_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // Executes |command| registered by |extension|. 93 // Executes |command| registered by |extension|.
94 void ExecuteExtensionCommand(const extensions::Extension* extension, 94 void ExecuteExtensionCommand(const extensions::Extension* extension,
95 const extensions::Command& command); 95 const extensions::Command& command);
96 96
97 // Shows the extension's page action, if present. 97 // Shows the extension's page action, if present.
98 void ShowPageActionPopup(const extensions::Extension* extension); 98 void ShowPageActionPopup(const extensions::Extension* extension);
99 99
100 // Shows the extension's browser action, if present. 100 // Shows the extension's browser action, if present.
101 void ShowBrowserActionPopup(const extensions::Extension* extension); 101 void ShowBrowserActionPopup(const extensions::Extension* extension);
102 102
103 // Shows the app (wrench) menu. |for_drop| indicates whether the menu is
104 // opened for a drag-and-drop operation.
105 void ShowAppMenu(bool for_drop);
106
107 // Accessors. 103 // Accessors.
108 Browser* browser() const { return browser_; } 104 Browser* browser() const { return browser_; }
109 BrowserActionsContainer* browser_actions() const { return browser_actions_; } 105 BrowserActionsContainer* browser_actions() const { return browser_actions_; }
110 ReloadButton* reload_button() const { return reload_; } 106 ReloadButton* reload_button() const { return reload_; }
111 LocationBarView* location_bar() const { return location_bar_; } 107 LocationBarView* location_bar() const { return location_bar_; }
112 views::MenuButton* app_menu() const; 108 views::MenuButton* app_menu() const;
113 HomeButton* home_button() const { return home_; } 109 HomeButton* home_button() const { return home_; }
114 110
115 // AccessiblePaneView: 111 // AccessiblePaneView:
116 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; 112 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 254
259 // A list of listeners to call when the menu opens. 255 // A list of listeners to call when the menu opens.
260 ObserverList<views::MenuListener> menu_listeners_; 256 ObserverList<views::MenuListener> menu_listeners_;
261 257
262 content::NotificationRegistrar registrar_; 258 content::NotificationRegistrar registrar_;
263 259
264 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 260 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
265 }; 261 };
266 262
267 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 263 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698