diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 18:19:42 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 18:19:42 +0000 |
| commit | f766a70dda65952faf951ea4c9b963f2f169e4d3 (patch) | |
| tree | 08a0cbc97dea7cd8e2600ba93306cddd58e33ecb /ash/shelf | |
| parent | 7a62edfd236e00645c34b7a40a775e4af3b81587 (diff) | |
| download | chromium_src-f766a70dda65952faf951ea4c9b963f2f169e4d3.zip chromium_src-f766a70dda65952faf951ea4c9b963f2f169e4d3.tar.gz chromium_src-f766a70dda65952faf951ea4c9b963f2f169e4d3.tar.bz2 | |
Rewrite scoped_ptr<T>(NULL) to use the default ctor in ash/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool
across all files built on CrOS in the ash/ directory.
BUG=173286
Review URL: https://chromiumcodereview.appspot.com/16968003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_widget.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index f789eac..9f95946 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -427,15 +427,13 @@ void ShelfWidget::DelegateView::UpdateBackground(int alpha) { SchedulePaint(); } -ShelfWidget::ShelfWidget( - aura::Window* shelf_container, - aura::Window* status_container, - internal::WorkspaceController* workspace_controller) : - launcher_(NULL), - delegate_view_(new DelegateView(this)), - background_animator_(delegate_view_, 0, kLauncherBackgroundAlpha), - activating_as_fallback_(false), - window_container_(shelf_container) { +ShelfWidget::ShelfWidget(aura::Window* shelf_container, + aura::Window* status_container, + internal::WorkspaceController* workspace_controller) + : delegate_view_(new DelegateView(this)), + background_animator_(delegate_view_, 0, kLauncherBackgroundAlpha), + activating_as_fallback_(false), + window_container_(shelf_container) { views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); params.transparent = true; |