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

Side by Side Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.h

Issue 10878013: Don't show the zoom bubble when the settings menu is showing on views or GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/settings/wrench/g Created 8 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
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/browser_toolbar_gtk.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 (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_GTK_BROWSER_TOOLBAR_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // Overridden from ui::AcceleratorProvider: 97 // Overridden from ui::AcceleratorProvider:
98 virtual bool GetAcceleratorForCommandId( 98 virtual bool GetAcceleratorForCommandId(
99 int id, 99 int id,
100 ui::Accelerator* accelerator) OVERRIDE; 100 ui::Accelerator* accelerator) OVERRIDE;
101 101
102 // content::NotificationObserver implementation. 102 // content::NotificationObserver implementation.
103 virtual void Observe(int type, 103 virtual void Observe(int type,
104 const content::NotificationSource& source, 104 const content::NotificationSource& source,
105 const content::NotificationDetails& details) OVERRIDE; 105 const content::NotificationDetails& details) OVERRIDE;
106 106
107 // Whether the wrench/hotdogs menu is currently visible to the user.
108 bool IsWrenchMenuShowing() const;
109
107 // Message that we should react to a state change. 110 // Message that we should react to a state change.
108 void UpdateWebContents(content::WebContents* contents, 111 void UpdateWebContents(content::WebContents* contents,
109 bool should_restore_state); 112 bool should_restore_state);
110 113
111 private: 114 private:
112 // Connect/Disconnect signals for dragging a url onto the home button. 115 // Connect/Disconnect signals for dragging a url onto the home button.
113 void SetUpDragForHomeButton(bool enable); 116 void SetUpDragForHomeButton(bool enable);
114 117
115 // Sets the top corners of the toolbar to rounded, or sets them to normal, 118 // Sets the top corners of the toolbar to rounded, or sets them to normal,
116 // depending on the state of the browser window. Returns false if no action 119 // depending on the state of the browser window. Returns false if no action
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // rendering. 218 // rendering.
216 ui::OwnedWidgetGtk offscreen_entry_; 219 ui::OwnedWidgetGtk offscreen_entry_;
217 220
218 // Manages the home button drop signal handler. 221 // Manages the home button drop signal handler.
219 scoped_ptr<ui::GtkSignalRegistrar> drop_handler_; 222 scoped_ptr<ui::GtkSignalRegistrar> drop_handler_;
220 223
221 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk); 224 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
222 }; 225 };
223 226
224 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ 227 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698