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

Side by Side Diff: ui/views/bubble/bubble_delegate.h

Issue 10383236: Revert 137059 - Better fix for closing uber tray when clicking on Desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ui/views/bubble/bubble_delegate.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 UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ 5 #ifndef UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
6 #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ 6 #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "ui/base/animation/animation_delegate.h" 10 #include "ui/base/animation/animation_delegate.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 virtual View* GetInitiallyFocusedView() OVERRIDE; 43 virtual View* GetInitiallyFocusedView() OVERRIDE;
44 virtual BubbleDelegateView* AsBubbleDelegate() OVERRIDE; 44 virtual BubbleDelegateView* AsBubbleDelegate() OVERRIDE;
45 virtual void WindowClosing() OVERRIDE; 45 virtual void WindowClosing() OVERRIDE;
46 virtual View* GetContentsView() OVERRIDE; 46 virtual View* GetContentsView() OVERRIDE;
47 virtual NonClientFrameView* CreateNonClientFrameView( 47 virtual NonClientFrameView* CreateNonClientFrameView(
48 views::Widget* widget) OVERRIDE; 48 views::Widget* widget) OVERRIDE;
49 49
50 // Widget::Observer overrides: 50 // Widget::Observer overrides:
51 virtual void OnWidgetClosing(Widget* widget) OVERRIDE; 51 virtual void OnWidgetClosing(Widget* widget) OVERRIDE;
52 virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE; 52 virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE;
53 virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE;
53 virtual void OnWidgetMoved(Widget* widget) OVERRIDE; 54 virtual void OnWidgetMoved(Widget* widget) OVERRIDE;
54 55
55 bool close_on_esc() const { return close_on_esc_; } 56 bool close_on_esc() const { return close_on_esc_; }
56 void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; } 57 void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; }
57 58
58 bool close_on_deactivate() const { return close_on_deactivate_; } 59 bool close_on_deactivate() const { return close_on_deactivate_; }
59 void set_close_on_deactivate(bool close_on_deactivate) { 60 void set_close_on_deactivate(bool close_on_deactivate) {
60 close_on_deactivate_ = close_on_deactivate; 61 close_on_deactivate_ = close_on_deactivate;
61 } 62 }
62 63
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 172
172 // Parent native window of the bubble. 173 // Parent native window of the bubble.
173 gfx::NativeView parent_window_; 174 gfx::NativeView parent_window_;
174 175
175 DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView); 176 DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
176 }; 177 };
177 178
178 } // namespace views 179 } // namespace views
179 180
180 #endif // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ 181 #endif // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698