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

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

Issue 7294024: Sound volume and bightness bubbles doesn't grab focus anymore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments. Created 9 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BUBBLE_BUBBLE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
6 #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/ui/views/bubble/bubble_border.h" 9 #include "chrome/browser/ui/views/bubble/bubble_border.h"
10 #include "ui/base/animation/animation_delegate.h" 10 #include "ui/base/animation/animation_delegate.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 virtual void InitBubble(views::Widget* parent, 148 virtual void InitBubble(views::Widget* parent,
149 const gfx::Rect& position_relative_to, 149 const gfx::Rect& position_relative_to,
150 BubbleBorder::ArrowLocation arrow_location, 150 BubbleBorder::ArrowLocation arrow_location,
151 views::View* contents, 151 views::View* contents,
152 BubbleDelegate* delegate); 152 BubbleDelegate* delegate);
153 153
154 // Instantiates and returns the BorderContents this Bubble should use. 154 // Instantiates and returns the BorderContents this Bubble should use.
155 // Subclasses can return their own BorderContents implementation. 155 // Subclasses can return their own BorderContents implementation.
156 virtual BorderContents* CreateBorderContents(); 156 virtual BorderContents* CreateBorderContents();
157 157
158 virtual void RegisterEscapeAccelerator();
glotov 2011/07/05 14:16:37 As discussed, please add a comment here that these
SeRya 2011/07/05 15:35:20 Added comment to SettingLevelBubble::ShowBubble. I
159 virtual void UnregisterEscapeAccelerator();
160
158 #if defined(OS_WIN) 161 #if defined(OS_WIN)
159 // Overridden from NativeWidgetWin: 162 // Overridden from NativeWidgetWin:
160 virtual void OnActivate(UINT action, BOOL minimized, HWND window); 163 virtual void OnActivate(UINT action, BOOL minimized, HWND window);
161 #elif defined(TOOLKIT_USES_GTK) 164 #elif defined(TOOLKIT_USES_GTK)
162 // Overridden from NativeWidgetGtk: 165 // Overridden from NativeWidgetGtk:
163 virtual void IsActiveChanged(); 166 virtual void IsActiveChanged();
164 #endif 167 #endif
165 168
166 #if defined(OS_WIN) 169 #if defined(OS_WIN)
167 // The window used to render the padding, border and arrow. 170 // The window used to render the padding, border and arrow.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 // Should we set a property telling the window manager to show this window 216 // Should we set a property telling the window manager to show this window
214 // onscreen even when the screen is locked? 217 // onscreen even when the screen is locked?
215 bool show_while_screen_is_locked_; 218 bool show_while_screen_is_locked_;
216 #endif 219 #endif
217 220
218 gfx::Rect position_relative_to_; 221 gfx::Rect position_relative_to_;
219 BubbleBorder::ArrowLocation arrow_location_; 222 BubbleBorder::ArrowLocation arrow_location_;
220 223
221 views::View* contents_; 224 views::View* contents_;
222 225
226 bool accelerator_registered_;
227
223 DISALLOW_COPY_AND_ASSIGN(Bubble); 228 DISALLOW_COPY_AND_ASSIGN(Bubble);
224 }; 229 };
225 230
226 #endif // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_ 231 #endif // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698