diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 20:27:06 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 20:27:06 +0000 |
| commit | 59e1c15b1ee0e29742a2479527de09715a2e5525 (patch) | |
| tree | cc52ad6f282cf4b5322fea744b8cea539ef6ff0c /chrome/browser/chromeos/frame/bubble_frame_view.cc | |
| parent | 474c37af2d3afbc3d4bb78a0aac813f338fa7e5c (diff) | |
| download | chromium_src-59e1c15b1ee0e29742a2479527de09715a2e5525.zip chromium_src-59e1c15b1ee0e29742a2479527de09715a2e5525.tar.gz chromium_src-59e1c15b1ee0e29742a2479527de09715a2e5525.tar.bz2 | |
This is a redo of http://codereview.chromium.org/7629009/
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7719001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/frame/bubble_frame_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/frame/bubble_frame_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index c0981b4..4d7cba8a 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -6,7 +6,7 @@ #include "chrome/browser/chromeos/frame/bubble_window.h" #include "chrome/browser/chromeos/login/helper.h" -#include "chrome/browser/ui/views/bubble/bubble_border.h" +#include "views/bubble/bubble_border.h" #include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" @@ -47,7 +47,7 @@ BubbleFrameView::BubbleFrameView(views::Widget* frame, title_(NULL), close_button_(NULL), throbber_(NULL) { - set_border(new BubbleBorder(BubbleBorder::NONE)); + set_border(new views::BubbleBorder(views::BubbleBorder::NONE)); if (widget_delegate->ShouldShowWindowTitle()) { title_ = new views::Label(widget_delegate->GetWindowTitle()); @@ -218,7 +218,7 @@ void BubbleFrameView::OnPaint(gfx::Canvas* canvas) { SkRect rect; rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()), SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom())); - SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius()); + SkScalar radius = SkIntToScalar(views::BubbleBorder::GetCornerRadius()); path.addRoundRect(rect, radius, radius); canvas->AsCanvasSkia()->drawPath(path, paint); |