diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 20:53:15 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 20:53:15 +0000 |
| commit | 95c6cc417f2a9e1c4d0603f16ff32c72613e8f28 (patch) | |
| tree | 0e9b19b4c64c79b9481d127dc912fb0950d396ff /ash | |
| parent | ea21c6f0bfa5ce63e3dc4bce7c91173112efbef1 (diff) | |
| download | chromium_src-95c6cc417f2a9e1c4d0603f16ff32c72613e8f28.zip chromium_src-95c6cc417f2a9e1c4d0603f16ff32c72613e8f28.tar.gz chromium_src-95c6cc417f2a9e1c4d0603f16ff32c72613e8f28.tar.bz2 | |
Ash: Constrained windows use new frames
BUG=117101
TEST=Turn off cookies, go to popuptest.com, open cookie management dialog, verify it has new frames
Review URL: https://chromiumcodereview.appspot.com/9649002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 2 | ||||
| -rw-r--r-- | ash/wm/custom_frame_view_ash.cc | 2 | ||||
| -rw-r--r-- | ash/wm/custom_frame_view_ash.h | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 1e8742a6..d7b5aad 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -578,7 +578,7 @@ views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( return new internal::DialogFrameView; } // Use translucent-style window frames for dialogs. - internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh; + CustomFrameViewAsh* frame_view = new CustomFrameViewAsh; frame_view->Init(widget); return frame_view; } diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc index 3344be8..ba34468 100644 --- a/ash/wm/custom_frame_view_ash.cc +++ b/ash/wm/custom_frame_view_ash.cc @@ -19,7 +19,6 @@ #include "ui/views/widget/widget_delegate.h" namespace ash { -namespace internal { // static const char CustomFrameViewAsh::kViewClassName[] = "ash/wm/CustomFrameViewAsh"; @@ -161,5 +160,4 @@ void CustomFrameViewAsh::InitClass() { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/custom_frame_view_ash.h b/ash/wm/custom_frame_view_ash.h index 5aacb47..8535cc9 100644 --- a/ash/wm/custom_frame_view_ash.h +++ b/ash/wm/custom_frame_view_ash.h @@ -6,6 +6,7 @@ #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ #pragma once +#include "ash/ash_export.h" #include "base/memory/scoped_ptr.h" #include "ui/views/controls/button/button.h" // ButtonListener #include "ui/views/window/non_client_view.h" @@ -22,12 +23,11 @@ class Widget; } namespace ash { -namespace internal { // A NonClientFrameView used for dialogs and other non-browser windows. // See also views::CustomFrameView and BrowserNonClientFrameViewAura. -class CustomFrameViewAsh : public views::NonClientFrameView, - public views::ButtonListener { +class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView, + public views::ButtonListener { public: // Internal class name. static const char kViewClassName[]; @@ -37,6 +37,8 @@ class CustomFrameViewAsh : public views::NonClientFrameView, void Init(views::Widget* frame); + views::ImageButton* close_button() { return close_button_; } + // views::NonClientFrameView overrides: virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; virtual gfx::Rect GetWindowBoundsForClientBounds( @@ -76,7 +78,6 @@ class CustomFrameViewAsh : public views::NonClientFrameView, DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); }; -} // namespace internal } // namespace ash #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ |