diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:54:29 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:54:29 +0000 |
| commit | d642c573d1d6a0a02a71e4ee0ae786056787aac2 (patch) | |
| tree | be77a771678dc2cdb0c0f7fbe27b5aed8c6396a0 /ash/system | |
| parent | 719164a4b43357d84de95405022183a342459c79 (diff) | |
| download | chromium_src-d642c573d1d6a0a02a71e4ee0ae786056787aac2.zip chromium_src-d642c573d1d6a0a02a71e4ee0ae786056787aac2.tar.gz chromium_src-d642c573d1d6a0a02a71e4ee0ae786056787aac2.tar.bz2 | |
ash: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details.
BUG=234765
Review URL: https://codereview.chromium.org/14307010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/chromeos/network/network_icon_animation.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/test_system_tray_delegate.cc | 3 | ||||
| -rw-r--r-- | ash/system/tray/tray_background_view.cc | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ash/system/chromeos/network/network_icon_animation.cc b/ash/system/chromeos/network/network_icon_animation.cc index 83664d9..1169c67 100644 --- a/ash/system/chromeos/network/network_icon_animation.cc +++ b/ash/system/chromeos/network/network_icon_animation.cc @@ -14,7 +14,7 @@ namespace ash { namespace network_icon { NetworkIconAnimation::NetworkIconAnimation() - : ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)) { + : animation_(this) { // Set up the animation throbber. animation_.SetThrobDuration(kThrobDurationMs); animation_.SetTweenType(ui::Tween::LINEAR); diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc index 913beb6..c51784b 100644 --- a/ash/system/tray/test_system_tray_delegate.cc +++ b/ash/system/tray/test_system_tray_delegate.cc @@ -57,8 +57,7 @@ TestSystemTrayDelegate::TestSystemTrayDelegate() cellular_enabled_(true), bluetooth_enabled_(true), caps_lock_enabled_(false), - volume_control_delegate_( - ALLOW_THIS_IN_INITIALIZER_LIST(new TestVolumeControlDelegate)) { + volume_control_delegate_(new TestVolumeControlDelegate) { } TestSystemTrayDelegate::~TestSystemTrayDelegate() { diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 857ab38..6a67a9e 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -166,12 +166,10 @@ TrayBackgroundView::TrayBackgroundView( tray_container_(NULL), shelf_alignment_(SHELF_ALIGNMENT_BOTTOM), background_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_( - this, 0, kTrayBackgroundAlpha)), - ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_( - this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)), - ALLOW_THIS_IN_INITIALIZER_LIST(widget_observer_( - new TrayWidgetObserver(this))) { + hide_background_animator_(this, 0, kTrayBackgroundAlpha), + hover_background_animator_( + this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha), + widget_observer_(new TrayWidgetObserver(this)) { set_notify_enter_exit_on_child(true); // Initially we want to paint the background, but without the hover effect. |