diff options
37 files changed, 55 insertions, 67 deletions
diff --git a/ui/app_list/app_list_menu.cc b/ui/app_list/app_list_menu.cc index f02a6ef..c8e93b8 100644 --- a/ui/app_list/app_list_menu.cc +++ b/ui/app_list/app_list_menu.cc @@ -13,7 +13,7 @@ namespace app_list { AppListMenu::AppListMenu(AppListViewDelegate* delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), + : menu_model_(this), delegate_(delegate) { InitMenu(); } diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 60b3a0c..9cfe08e 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -110,7 +110,7 @@ AppsGridView::AppsGridView(AppsGridViewDelegate* delegate, drag_pointer_(NONE), page_flip_target_(-1), page_flip_delay_in_ms_(kPageFlipDelayInMs), - ALLOW_THIS_IN_INITIALIZER_LIST(bounds_animator_(this)) { + bounds_animator_(this) { pagination_model_->AddObserver(this); AddChildView(page_switcher_view_); } diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc index 86f42c0..6abda38 100644 --- a/ui/app_list/views/contents_view.cc +++ b/ui/app_list/views/contents_view.cc @@ -49,8 +49,7 @@ ContentsView::ContentsView(AppListMainView* app_list_main_view, : show_state_(SHOW_APPS), pagination_model_(pagination_model), view_model_(new views::ViewModel), - ALLOW_THIS_IN_INITIALIZER_LIST( - bounds_animator_(new views::BoundsAnimator(this))) { + bounds_animator_(new views::BoundsAnimator(this)) { pagination_model_->SetTransitionDurations( kPageTransitionDurationInMs, kOverscrollPageTransitionDurationMs); diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc index 499bbff..a24d643 100644 --- a/ui/app_list/views/search_result_list_view.cc +++ b/ui/app_list/views/search_result_list_view.cc @@ -27,7 +27,7 @@ SearchResultListView::SearchResultListView( results_(NULL), last_visible_index_(0), selected_index_(-1), - ALLOW_THIS_IN_INITIALIZER_LIST(update_factory_(this)) { + update_factory_(this) { SetLayoutManager( new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0)); diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index e3fccfb..cfc0284 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -142,9 +142,9 @@ RootWindow::CreateParams::CreateParams(const gfx::Rect& a_initial_bounds) RootWindow::RootWindow(const CreateParams& params) : Window(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(host_(CreateHost(this, params))), - ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), + host_(CreateHost(this, params)), + schedule_paint_factory_(this), + event_factory_(this), mouse_button_flags_(0), touch_ids_down_(0), last_cursor_(ui::kCursorNull), @@ -152,15 +152,14 @@ RootWindow::RootWindow(const CreateParams& params) mouse_moved_handler_(NULL), mouse_event_dispatch_target_(NULL), event_dispatch_target_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST( - gesture_recognizer_(ui::GestureRecognizer::Create(this))), + gesture_recognizer_(ui::GestureRecognizer::Create(this)), synthesize_mouse_move_(false), waiting_on_compositing_end_(false), draw_on_compositing_end_(false), defer_draw_scheduling_(false), mouse_move_hold_count_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(held_event_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(repostable_event_factory_(this)) { + held_event_factory_(this), + repostable_event_factory_(this) { SetName("RootWindow"); compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget())); diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc index 227d502..8b122fb 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -71,7 +71,7 @@ void SimpleMenuModel::Delegate::MenuClosed(SimpleMenuModel* /*source*/) { SimpleMenuModel::SimpleMenuModel(Delegate* delegate) : delegate_(delegate), menu_model_delegate_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { + method_factory_(this) { } SimpleMenuModel::~SimpleMenuModel() { diff --git a/ui/base/win/hwnd_subclass.cc b/ui/base/win/hwnd_subclass.cc index febfa9e..c1133f0 100644 --- a/ui/base/win/hwnd_subclass.cc +++ b/ui/base/win/hwnd_subclass.cc @@ -122,7 +122,7 @@ void HWNDSubclass::RemoveFilter(HWNDMessageFilter* filter) { HWNDSubclass::HWNDSubclass(HWND target) : target_(target), original_wnd_proc_(GetCurrentWndProc(target)), - ALLOW_THIS_IN_INITIALIZER_LIST(prop_(target, kHWNDSubclassKey, this)) { + prop_(target, kHWNDSubclassKey, this) { ui::SetWindowProc(target_, &WndProc); } diff --git a/ui/compositor/test/test_compositor_host_linux.cc b/ui/compositor/test/test_compositor_host_linux.cc index 789ac19..463b9b2 100644 --- a/ui/compositor/test/test_compositor_host_linux.cc +++ b/ui/compositor/test/test_compositor_host_linux.cc @@ -48,7 +48,7 @@ class TestCompositorHostLinux : public TestCompositorHost, TestCompositorHostLinux::TestCompositorHostLinux(const gfx::Rect& bounds) : bounds_(bounds), - ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { + method_factory_(this) { } TestCompositorHostLinux::~TestCompositorHostLinux() { diff --git a/ui/message_center/views/message_bubble_base.cc b/ui/message_center/views/message_bubble_base.cc index 4d35e31..a9405b9 100644 --- a/ui/message_center/views/message_bubble_base.cc +++ b/ui/message_center/views/message_bubble_base.cc @@ -25,7 +25,7 @@ const SkColor MessageBubbleBase::kBackgroundColor = MessageBubbleBase::MessageBubbleBase(MessageCenter* message_center) : message_center_(message_center), bubble_view_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), max_height_(kMessageBubbleBaseDefaultMaxHeight) { } diff --git a/ui/message_center/views/message_view.cc b/ui/message_center/views/message_view.cc index 4858981..6379f94 100644 --- a/ui/message_center/views/message_view.cc +++ b/ui/message_center/views/message_view.cc @@ -225,7 +225,7 @@ MenuModel::MenuModel(message_center::MessageCenter* message_center, const std::string& notification_id, const string16& display_source, const std::string& extension_id) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), + : ui::SimpleMenuModel(this), message_center_(message_center), notification_id_(notification_id) { // Add 'disable notifications' menu item. diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index 8863bcb..06de4ee 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -350,7 +350,7 @@ NativeThemeWin::NativeThemeWin() set_theme_properties_(NULL), is_theme_active_(NULL), get_theme_int_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(color_change_listener_(this)) { + color_change_listener_(this) { if (theme_dll_) { draw_theme_ = reinterpret_cast<DrawThemeBackgroundPtr>( GetProcAddress(theme_dll_, "DrawThemeBackground")); diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index 21e9076..d344471 100644 --- a/ui/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_view.cc @@ -43,7 +43,7 @@ class AccessiblePaneViewFocusSearch : public FocusSearch { AccessiblePaneView::AccessiblePaneView() : pane_has_focus_(false), allow_deactivate_on_esc_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), + method_factory_(this), focus_manager_(NULL), home_key_(ui::VKEY_HOME, ui::EF_NONE), end_key_(ui::VKEY_END, ui::EF_NONE), diff --git a/ui/views/controls/button/button_dropdown.cc b/ui/views/controls/button/button_dropdown.cc index fc34288..4261294 100644 --- a/ui/views/controls/button/button_dropdown.cc +++ b/ui/views/controls/button/button_dropdown.cc @@ -37,7 +37,7 @@ ButtonDropDown::ButtonDropDown(ButtonListener* listener, ui::MenuModel* model) model_(model), menu_showing_(false), y_position_on_lbuttondown_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_factory_(this)) { + show_menu_factory_(this) { set_context_menu_controller(this); } diff --git a/ui/views/controls/glow_hover_controller.cc b/ui/views/controls/glow_hover_controller.cc index 0dbfd72..f2e3bf2 100644 --- a/ui/views/controls/glow_hover_controller.cc +++ b/ui/views/controls/glow_hover_controller.cc @@ -21,7 +21,7 @@ static const int kTrackHoverDurationMs = 400; GlowHoverController::GlowHoverController(views::View* view) : view_(view), - ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)), + animation_(this), opacity_scale_(kTrackOpacityScale) { animation_.set_delegate(this); } diff --git a/ui/views/controls/menu/menu_2.cc b/ui/views/controls/menu/menu_2.cc index c421a79..21bf323 100644 --- a/ui/views/controls/menu/menu_2.cc +++ b/ui/views/controls/menu/menu_2.cc @@ -11,8 +11,7 @@ namespace views { Menu2::Menu2(ui::MenuModel* model) : model_(model), - ALLOW_THIS_IN_INITIALIZER_LIST( - wrapper_(MenuWrapper::CreateWrapper(model))) { + wrapper_(MenuWrapper::CreateWrapper(model)) { Rebuild(); } diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index 4f40c65..3f2d1f0 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc @@ -398,7 +398,7 @@ NativeMenuWin::NativeMenuWin(ui::MenuModel* model, HWND system_menu_for) menu_action_(MENU_ACTION_NONE), menu_to_select_(NULL), position_to_select_(-1), - ALLOW_THIS_IN_INITIALIZER_LIST(menu_to_select_factory_(this)), + menu_to_select_factory_(this), parent_(NULL), destroyed_flag_(NULL) { } diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc index 86a5afc..0e78ffe 100644 --- a/ui/views/controls/menu/submenu_view.cc +++ b/ui/views/controls/menu/submenu_view.cc @@ -41,8 +41,7 @@ SubmenuView::SubmenuView(MenuItemView* parent) max_accelerator_width_(0), minimum_preferred_width_(0), resize_open_menu_(false), - ALLOW_THIS_IN_INITIALIZER_LIST( - scroll_animator_(new ScrollAnimator(this))) { + scroll_animator_(new ScrollAnimator(this)) { DCHECK(parent); // We'll delete ourselves, otherwise the ScrollView would delete us on close. set_owned_by_client(); diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc index 18b7760..a62974d 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -42,8 +42,8 @@ BaseScrollBar::BaseScrollBar(bool horizontal, BaseScrollBarThumb* thumb) contents_scroll_offset_(0), thumb_track_state_(CustomButton::STATE_NORMAL), last_scroll_amount_(SCROLL_NONE), - ALLOW_THIS_IN_INITIALIZER_LIST(repeater_( - base::Bind(&BaseScrollBar::TrackClicked, base::Unretained(this)))), + repeater_(base::Bind(&BaseScrollBar::TrackClicked, + base::Unretained(this))), context_menu_mouse_position_(0) { AddChildView(thumb_); diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc index 4c4216b..6eba692 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_button.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar_button.cc @@ -12,9 +12,8 @@ namespace views { BaseScrollBarButton::BaseScrollBarButton(ButtonListener* listener) : CustomButton(listener), - ALLOW_THIS_IN_INITIALIZER_LIST(repeater_( - base::Bind(&BaseScrollBarButton::RepeaterNotifyClick, - base::Unretained(this)))) { + repeater_(base::Bind(&BaseScrollBarButton::RepeaterNotifyClick, + base::Unretained(this))) { } BaseScrollBarButton::~BaseScrollBarButton() { diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc index c9347a1..1f0f1bb6 100644 --- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -50,9 +50,8 @@ class AutorepeatButton : public ImageButton { public: explicit AutorepeatButton(ButtonListener* listener) : ImageButton(listener), - ALLOW_THIS_IN_INITIALIZER_LIST(repeater_( - base::Bind(&AutorepeatButton::NotifyClick, - base::Unretained(this)))) { + repeater_(base::Bind(&AutorepeatButton::NotifyClick, + base::Unretained(this))) { } virtual ~AutorepeatButton() {} @@ -170,8 +169,8 @@ class BitmapScrollBarThumb : public BaseScrollBarThumb { BitmapScrollBar::BitmapScrollBar(bool horizontal, bool show_scroll_buttons) : BaseScrollBar(horizontal, new BitmapScrollBarThumb(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(prev_button_(new AutorepeatButton(this))), - ALLOW_THIS_IN_INITIALIZER_LIST(next_button_(new AutorepeatButton(this))), + prev_button_(new AutorepeatButton(this)), + next_button_(new AutorepeatButton(this)), show_scroll_buttons_(show_scroll_buttons) { if (!show_scroll_buttons_) { prev_button_->SetVisible(false); diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index 65a2e6e..d189a4a 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -69,7 +69,7 @@ const int NativeTextfieldViews::kCursorBlinkCycleMs = 1000; NativeTextfieldViews::NativeTextfieldViews(Textfield* parent) : textfield_(parent), - ALLOW_THIS_IN_INITIALIZER_LIST(model_(new TextfieldViewsModel(this))), + model_(new TextfieldViewsModel(this)), text_border_(new FocusableBorder()), is_cursor_visible_(false), is_drop_cursor_visible_(false), diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index 8c392b9..3d24b25 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -98,9 +98,8 @@ NativeTextfieldWin::NativeTextfieldWin(Textfield* textfield) ime_composition_length_(0), container_view_(new NativeViewHost), bg_color_(0), - ALLOW_THIS_IN_INITIALIZER_LIST( - tsf_event_router_(base::win::IsTSFAwareRequired() ? - new ui::TSFEventRouter(this) : NULL)) { + tsf_event_router_(base::win::IsTSFAwareRequired() ? + new ui::TSFEventRouter(this) : NULL) { if (!loaded_libarary_module_) { // msftedit.dll is RichEdit ver 4.1. // This version is available from WinXP SP1 and has TSF support. diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc index eaab151..8997a6e 100644 --- a/ui/views/corewm/focus_controller.cc +++ b/ui/views/corewm/focus_controller.cc @@ -60,7 +60,7 @@ FocusController::FocusController(FocusRules* rules) updating_focus_(false), updating_activation_(false), rules_(rules), - ALLOW_THIS_IN_INITIALIZER_LIST(observer_manager_(this)) { + observer_manager_(this) { DCHECK(rules); } diff --git a/ui/views/corewm/input_method_event_filter.cc b/ui/views/corewm/input_method_event_filter.cc index 24475d7..f8e9647 100644 --- a/ui/views/corewm/input_method_event_filter.cc +++ b/ui/views/corewm/input_method_event_filter.cc @@ -17,8 +17,7 @@ namespace corewm { // InputMethodEventFilter, public: InputMethodEventFilter::InputMethodEventFilter(gfx::AcceleratedWidget widget) - : ALLOW_THIS_IN_INITIALIZER_LIST( - input_method_(ui::CreateInputMethod(this, widget))), + : input_method_(ui::CreateInputMethod(this, widget)), target_root_window_(NULL) { // TODO(yusukes): Check if the root window is currently focused and pass the // result to Init(). diff --git a/ui/views/corewm/shadow_controller.cc b/ui/views/corewm/shadow_controller.cc index 2e7bfe6..49307d8 100644 --- a/ui/views/corewm/shadow_controller.cc +++ b/ui/views/corewm/shadow_controller.cc @@ -234,7 +234,7 @@ void ShadowController::Impl::CreateShadowForWindow(aura::Window* window) { } ShadowController::Impl::Impl() - : ALLOW_THIS_IN_INITIALIZER_LIST(observer_manager_(this)) { + : observer_manager_(this) { aura::Env::GetInstance()->AddObserver(this); } diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index d23b657..472e1f59 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -77,7 +77,7 @@ class ExampleMenuButton : public MenuButton, public MenuButtonListener { // ExampleMenuModel --------------------------------------------------------- ExampleMenuModel::ExampleMenuModel() - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), + : ui::SimpleMenuModel(this), current_encoding_command_id_(COMMAND_SELECT_ASCII) { AddItem(COMMAND_DO_SOMETHING, ASCIIToUTF16("Do Something")); AddSeparator(ui::NORMAL_SEPARATOR); @@ -177,7 +177,7 @@ void ExampleMenuModel::ExecuteCommand(int command_id, int event_flags) { // ExampleMenuButton ----------------------------------------------------------- ExampleMenuButton::ExampleMenuButton(const string16& test) - : ALLOW_THIS_IN_INITIALIZER_LIST(MenuButton(NULL, test, this, true)) { + : MenuButton(NULL, test, this, true) { } ExampleMenuButton::~ExampleMenuButton() { diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc index badaee0..88ec5f4 100644 --- a/ui/views/mouse_watcher.cc +++ b/ui/views/mouse_watcher.cc @@ -23,7 +23,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer { public: explicit Observer(MouseWatcher* mouse_watcher) : mouse_watcher_(mouse_watcher), - ALLOW_THIS_IN_INITIALIZER_LIST(notify_listener_factory_(this)) { + notify_listener_factory_(this) { MessageLoopForUI::current()->AddObserver(this); } diff --git a/ui/views/test/child_modal_window.cc b/ui/views/test/child_modal_window.cc index 266b2c6..8b945da0 100644 --- a/ui/views/test/child_modal_window.cc +++ b/ui/views/test/child_modal_window.cc @@ -108,8 +108,8 @@ ui::ModalType ChildModalWindow::GetModalType() const { } ChildModalParent::ChildModalParent(gfx::NativeView context) - : ALLOW_THIS_IN_INITIALIZER_LIST(button_(new LabelButton( - this, ASCIIToUTF16("Show/Hide Child Modal Window")))), + : button_(new LabelButton(this, + ASCIIToUTF16("Show/Hide Child Modal Window"))), textfield_(new Textfield), host_(new NativeViewHost), modal_parent_(NULL), diff --git a/ui/views/view.cc b/ui/views/view.cc index 431c42c..179c9de 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -186,8 +186,7 @@ View::View() accessibility_focusable_(false), context_menu_controller_(NULL), drag_controller_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(post_dispatch_handler_( - new internal::PostEventDispatchHandler(this))), + post_dispatch_handler_(new internal::PostEventDispatchHandler(this)), native_view_accessibility_(NULL) { AddPostTargetHandler(post_dispatch_handler_.get()); } diff --git a/ui/views/widget/desktop_aura/desktop_activation_client.cc b/ui/views/widget/desktop_aura/desktop_activation_client.cc index 3f12da4..dc8f062 100644 --- a/ui/views/widget/desktop_aura/desktop_activation_client.cc +++ b/ui/views/widget/desktop_aura/desktop_activation_client.cc @@ -28,7 +28,7 @@ DesktopActivationClient::DesktopActivationClient(aura::RootWindow* root_window) : root_window_(root_window), current_active_(NULL), updating_activation_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(observer_manager_(this)) { + observer_manager_(this) { aura::client::GetFocusClient(root_window_)->AddObserver(this); aura::client::SetActivationClient(root_window_, this); root_window->AddPreTargetHandler(this); diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 39b862e..8f208c9 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -159,10 +159,10 @@ class DesktopNativeWidgetAuraStackingClient : DesktopNativeWidgetAura::DesktopNativeWidgetAura( internal::NativeWidgetDelegate* delegate) : ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), - ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)), + close_widget_factory_(this), can_activate_(true), desktop_root_window_host_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))), + window_(new aura::Window(this)), native_widget_delegate_(delegate), last_drop_operation_(ui::DragDropTypes::DRAG_NONE), restore_focus_on_activate_(false) { diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc index 431e941..7025bc9 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc @@ -55,8 +55,7 @@ DesktopRootWindowHostWin::DesktopRootWindowHostWin( internal::NativeWidgetDelegate* native_widget_delegate, DesktopNativeWidgetAura* desktop_native_widget_aura, const gfx::Rect& initial_bounds) - : ALLOW_THIS_IN_INITIALIZER_LIST( - message_handler_(new HWNDMessageHandler(this))), + : message_handler_(new HWNDMessageHandler(this)), native_widget_delegate_(native_widget_delegate), desktop_native_widget_aura_(desktop_native_widget_aura), root_window_host_delegate_(NULL), diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index fd9db93..86181c9 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -66,9 +66,9 @@ void SetRestoreBounds(aura::Window* window, const gfx::Rect& bounds) { NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate) : delegate_(delegate), - ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))), + window_(new aura::Window(this)), ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), - ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)), + close_widget_factory_(this), can_activate_(true), destroying_(false), cursor_(gfx::kNullCursor), diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 8abb6ae..6e8c4f4 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -83,8 +83,7 @@ NativeWidgetWin::NativeWidgetWin(internal::NativeWidgetDelegate* delegate) : delegate_(delegate), ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), has_non_client_view_(false), - ALLOW_THIS_IN_INITIALIZER_LIST( - message_handler_(new HWNDMessageHandler(this))) { + message_handler_(new HWNDMessageHandler(this)) { } NativeWidgetWin::~NativeWidgetWin() { diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index 0d3d0d3..671aeb0 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -66,7 +66,7 @@ RootView::RootView(Widget* widget) touch_pressed_handler_(NULL), gesture_handler_(NULL), scroll_gesture_handler_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(focus_search_(this, false, false)), + focus_search_(this, false, false), focus_traversable_parent_(NULL), focus_traversable_parent_view_(NULL), event_dispatch_target_(NULL) { diff --git a/ui/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc index 98891ea..b21f81f 100644 --- a/ui/views/widget/tooltip_manager_win.cc +++ b/ui/views/widget/tooltip_manager_win.cc @@ -78,7 +78,7 @@ TooltipManagerWin::TooltipManagerWin(Widget* widget) last_view_out_of_sync_(false), tooltip_width_(0), keyboard_tooltip_hwnd_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(keyboard_tooltip_factory_(this)) { + keyboard_tooltip_factory_(this) { DCHECK(widget); DCHECK(widget->GetNativeView()); } diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index 7dbbf71..d79b4a5 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -370,9 +370,8 @@ class HWNDMessageHandler::ScopedRedrawLock { HWNDMessageHandler::HWNDMessageHandler(HWNDMessageHandlerDelegate* delegate) : delegate_(delegate), - ALLOW_THIS_IN_INITIALIZER_LIST( - fullscreen_handler_(new FullscreenHandler)), - ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)), + fullscreen_handler_(new FullscreenHandler), + close_widget_factory_(this), remove_standard_frame_(false), use_system_default_icon_(false), restore_focus_when_enabled_(false), @@ -383,11 +382,11 @@ HWNDMessageHandler::HWNDMessageHandler(HWNDMessageHandlerDelegate* delegate) lock_updates_count_(0), destroyed_(NULL), ignore_window_pos_changes_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(ignore_pos_changes_factory_(this)), + ignore_pos_changes_factory_(this), last_monitor_(NULL), use_layered_buffer_(false), layered_alpha_(255), - ALLOW_THIS_IN_INITIALIZER_LIST(paint_layered_window_factory_(this)), + paint_layered_window_factory_(this), can_update_layered_window_(true), is_first_nccalc_(true) { } |