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

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

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
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 #include "chrome/browser/chromeos/frame/bubble_frame_view.h" 5 #include "chrome/browser/chromeos/frame/bubble_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/frame/bubble_window.h" 10 #include "chrome/browser/chromeos/frame/bubble_window.h"
(...skipping 26 matching lines...) Expand all
37 #else 37 #else
38 const int kTitleFontSizeDelta = 1; 38 const int kTitleFontSizeDelta = 1;
39 #endif 39 #endif
40 40
41 } // namespace 41 } // namespace
42 42
43 namespace chromeos { 43 namespace chromeos {
44 44
45 BubbleFrameView::BubbleFrameView(views::Widget* frame, 45 BubbleFrameView::BubbleFrameView(views::Widget* frame,
46 views::WidgetDelegate* widget_delegate, 46 views::WidgetDelegate* widget_delegate,
47 BubbleWindowStyle style) 47 DialogStyle style)
48 : frame_(frame), 48 : frame_(frame),
49 style_(style), 49 style_(style),
50 title_(NULL), 50 title_(NULL),
51 close_button_(NULL), 51 close_button_(NULL),
52 throbber_(NULL) { 52 throbber_(NULL) {
53 if (widget_delegate->ShouldShowWindowTitle()) { 53 if (widget_delegate->ShouldShowWindowTitle()) {
54 title_ = new views::Label(widget_delegate->GetWindowTitle()); 54 title_ = new views::Label(widget_delegate->GetWindowTitle());
55 title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 55 title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
56 title_->SetFont(title_->font().DeriveFont(kFontSizeCorrectionDelta, 56 title_->SetFont(title_->font().DeriveFont(kFontSizeCorrectionDelta,
57 gfx::Font::BOLD)); 57 gfx::Font::BOLD));
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 canvas->GetSkCanvas()->drawPath(path, paint); 217 canvas->GetSkCanvas()->drawPath(path, paint);
218 } 218 }
219 219
220 void BubbleFrameView::ButtonPressed(views::Button* sender, 220 void BubbleFrameView::ButtonPressed(views::Button* sender,
221 const views::Event& event) { 221 const views::Event& event) {
222 if (close_button_ != NULL && sender == close_button_) 222 if (close_button_ != NULL && sender == close_button_)
223 frame_->Close(); 223 frame_->Close();
224 } 224 }
225 225
226 } // namespace chromeos 226 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/bubble_frame_view.h ('k') | chrome/browser/chromeos/frame/bubble_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698