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

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

Issue 8416053: Gets Bubble to work on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make Layer::SetOpacity do ScheduleDraw Created 9 years, 1 month 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/views/bubble/bubble.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) 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 "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "views/bubble/bubble_border.h" 10 #include "views/bubble/bubble_border.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 views::BubbleBorder::ArrowLocation arrow_location, 183 views::BubbleBorder::ArrowLocation arrow_location,
184 views::View* contents, 184 views::View* contents,
185 BubbleDelegate* delegate); 185 BubbleDelegate* delegate);
186 186
187 // Instantiates and returns the BorderContents this Bubble should use. 187 // Instantiates and returns the BorderContents this Bubble should use.
188 // Subclasses can return their own BorderContents implementation. 188 // Subclasses can return their own BorderContents implementation.
189 virtual BorderContents* CreateBorderContents(); 189 virtual BorderContents* CreateBorderContents();
190 190
191 #if defined(USE_AURA) 191 #if defined(USE_AURA)
192 // Overridden from NativeWidgetAura: 192 // Overridden from NativeWidgetAura:
193 // TODO(beng): OnActivate(); 193 virtual void OnLostActive() OVERRIDE;
194 #elif defined(OS_WIN) 194 #elif defined(OS_WIN)
195 // Overridden from NativeWidgetWin: 195 // Overridden from NativeWidgetWin:
196 virtual void OnActivate(UINT action, BOOL minimized, HWND window); 196 virtual void OnActivate(UINT action, BOOL minimized, HWND window);
197 #elif defined(TOUCH_UI) 197 #elif defined(TOUCH_UI)
198 // Overridden from NativeWidgetViews:: 198 // Overridden from NativeWidgetViews::
199 virtual void Deactivate() OVERRIDE; 199 virtual void Deactivate() OVERRIDE;
200 #elif defined(TOOLKIT_USES_GTK) 200 #elif defined(TOOLKIT_USES_GTK)
201 // Overridden from NativeWidgetGtk: 201 // Overridden from NativeWidgetGtk:
202 virtual void OnActiveChanged() OVERRIDE; 202 virtual void OnActiveChanged() OVERRIDE;
203 #endif 203 #endif
204 204
205 #if defined(USE_AURA) 205 #if defined(OS_WIN) && !defined(USE_AURA)
206 // TODO(beng):
207 #elif defined(OS_WIN)
208 // The window used to render the padding, border and arrow. 206 // The window used to render the padding, border and arrow.
209 BorderWidgetWin* border_; 207 BorderWidgetWin* border_;
210 #elif defined(TOOLKIT_USES_GTK) 208 #else
211 // The view displaying the border. 209 // The view displaying the border.
212 BorderContents* border_contents_; 210 BorderContents* border_contents_;
213 #endif 211 #endif
214 212
215 private: 213 private:
216 enum ShowStatus { 214 enum ShowStatus {
217 kOpen, 215 kOpen,
218 kClosing, 216 kClosing,
219 kClosed 217 kClosed
220 }; 218 };
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 views::View* contents_; 267 views::View* contents_;
270 268
271 bool accelerator_registered_; 269 bool accelerator_registered_;
272 270
273 ObserverList<Observer> observer_list_; 271 ObserverList<Observer> observer_list_;
274 272
275 DISALLOW_COPY_AND_ASSIGN(Bubble); 273 DISALLOW_COPY_AND_ASSIGN(Bubble);
276 }; 274 };
277 275
278 #endif // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_ 276 #endif // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/bubble/bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698