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

Side by Side Diff: chrome/browser/chromeos/frame/bubble_frame_view.h

Issue 8469006: Promote bubble_window_style to more general dialog_style. (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Change base url and merge trunk. 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/bubble_frame_view.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_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/chromeos/frame/bubble_window.h" 9 #include "chrome/browser/chromeos/frame/bubble_window.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 27
28 namespace chromeos { 28 namespace chromeos {
29 29
30 // BubbleFrameView implements a BubbleBorder based window frame. 30 // BubbleFrameView implements a BubbleBorder based window frame.
31 class BubbleFrameView : public views::NonClientFrameView, 31 class BubbleFrameView : public views::NonClientFrameView,
32 public views::ButtonListener { 32 public views::ButtonListener {
33 public: 33 public:
34 BubbleFrameView(views::Widget* frame, 34 BubbleFrameView(views::Widget* frame,
35 views::WidgetDelegate* widget_delegate, 35 views::WidgetDelegate* widget_delegate,
36 BubbleWindowStyle style); 36 DialogStyle style);
37 virtual ~BubbleFrameView(); 37 virtual ~BubbleFrameView();
38 38
39 // Overridden from views::NonClientFrameView: 39 // Overridden from views::NonClientFrameView:
40 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 40 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
41 virtual gfx::Rect GetWindowBoundsForClientBounds( 41 virtual gfx::Rect GetWindowBoundsForClientBounds(
42 const gfx::Rect& client_bounds) const OVERRIDE; 42 const gfx::Rect& client_bounds) const OVERRIDE;
43 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 43 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
44 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 44 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
45 OVERRIDE; 45 OVERRIDE;
46 virtual void EnableClose(bool enable) OVERRIDE; 46 virtual void EnableClose(bool enable) OVERRIDE;
(...skipping 11 matching lines...) Expand all
58 OVERRIDE; 58 OVERRIDE;
59 59
60 void StartThrobber(); 60 void StartThrobber();
61 void StopThrobber(); 61 void StopThrobber();
62 62
63 private: 63 private:
64 // The window that owns this view. 64 // The window that owns this view.
65 views::Widget* frame_; 65 views::Widget* frame_;
66 66
67 // Allows to tweak appearance of the view. 67 // Allows to tweak appearance of the view.
68 BubbleWindowStyle style_; 68 DialogStyle style_;
69 69
70 // Title label 70 // Title label
71 views::Label* title_; 71 views::Label* title_;
72 72
73 // The bounds of the client view, in this view's coordinates. 73 // The bounds of the client view, in this view's coordinates.
74 gfx::Rect client_view_bounds_; 74 gfx::Rect client_view_bounds_;
75 75
76 // Close button for STYLE_XBAR case. 76 // Close button for STYLE_XBAR case.
77 views::ImageButton* close_button_; 77 views::ImageButton* close_button_;
78 78
79 // Throbber is optional. Employed by STYLE_THROBBER. 79 // Throbber is optional. Employed by STYLE_THROBBER.
80 views::Throbber* throbber_; 80 views::Throbber* throbber_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(BubbleFrameView); 82 DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
83 }; 83 };
84 84
85 } // namespace chromeos 85 } // namespace chromeos
86 86
87 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_ 87 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_
88
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/bubble_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698