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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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
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"
11 #include "chrome/browser/chromeos/login/helper.h" 11 #include "chrome/browser/chromeos/login/helper.h"
12 #include "grit/theme_resources_standard.h" 12 #include "grit/theme_resources_standard.h"
13 #include "third_party/skia/include/core/SkColor.h"
14 #include "third_party/skia/include/core/SkPaint.h"
13 #include "ui/base/hit_test.h" 15 #include "ui/base/hit_test.h"
14 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/canvas_skia.h" 17 #include "ui/gfx/canvas_skia.h"
16 #include "ui/gfx/font.h" 18 #include "ui/gfx/font.h"
17 #include "ui/gfx/insets.h" 19 #include "ui/gfx/insets.h"
18 #include "ui/gfx/path.h" 20 #include "ui/gfx/path.h"
19 #include "ui/gfx/rect.h" 21 #include "ui/gfx/rect.h"
22 #include "ui/views/widget/widget.h"
23 #include "ui/views/widget/widget_delegate.h"
20 #include "views/controls/button/image_button.h" 24 #include "views/controls/button/image_button.h"
21 #include "views/controls/label.h" 25 #include "views/controls/label.h"
22 #include "views/controls/throbber.h" 26 #include "views/controls/throbber.h"
23 #include "views/widget/widget.h"
24 #include "views/widget/widget_delegate.h"
25 #include "third_party/skia/include/core/SkColor.h"
26 #include "third_party/skia/include/core/SkPaint.h"
27 27
28 namespace { 28 namespace {
29 29
30 const int kTitleTopPadding = 10; 30 const int kTitleTopPadding = 10;
31 const int kTitleContentPadding = 10; 31 const int kTitleContentPadding = 10;
32 const int kHorizontalPadding = 10; 32 const int kHorizontalPadding = 10;
33 33
34 // Title font size correction. 34 // Title font size correction.
35 #if defined(CROS_FONTS_USING_BCI) 35 #if defined(CROS_FONTS_USING_BCI)
36 const int kTitleFontSizeDelta = 0; 36 const int kTitleFontSizeDelta = 0;
(...skipping 180 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/browser_view.cc ('k') | chrome/browser/chromeos/frame/bubble_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698