| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/constrained_window_views.h" | 5 #include "chrome/browser/ui/views/constrained_window_views.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "components/web_modal/popup_manager.h" | 10 #include "components/web_modal/popup_manager.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 } | 42 } |
| 43 | 43 |
| 44 virtual ~BrowserModalDialogHostObserverViews() { | 44 virtual ~BrowserModalDialogHostObserverViews() { |
| 45 if (host_) | 45 if (host_) |
| 46 host_->RemoveObserver(this); | 46 host_->RemoveObserver(this); |
| 47 target_widget_->RemoveObserver(this); | 47 target_widget_->RemoveObserver(this); |
| 48 target_widget_->SetNativeWindowProperty(native_window_property_, NULL); | 48 target_widget_->SetNativeWindowProperty(native_window_property_, NULL); |
| 49 } | 49 } |
| 50 | 50 |
| 51 // WidgetObserver overrides | 51 // WidgetObserver overrides |
| 52 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE { | 52 virtual void OnWidgetClosing(views::Widget* widget) override { |
| 53 delete this; | 53 delete this; |
| 54 } | 54 } |
| 55 | 55 |
| 56 // WebContentsModalDialogHostObserver overrides | 56 // WebContentsModalDialogHostObserver overrides |
| 57 virtual void OnPositionRequiresUpdate() OVERRIDE { | 57 virtual void OnPositionRequiresUpdate() override { |
| 58 UpdateBrowserModalDialogPosition(target_widget_, host_); | 58 UpdateBrowserModalDialogPosition(target_widget_, host_); |
| 59 } | 59 } |
| 60 | 60 |
| 61 virtual void OnHostDestroying() OVERRIDE { | 61 virtual void OnHostDestroying() override { |
| 62 host_->RemoveObserver(this); | 62 host_->RemoveObserver(this); |
| 63 host_ = NULL; | 63 host_ = NULL; |
| 64 } | 64 } |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 ModalDialogHost* host_; | 67 ModalDialogHost* host_; |
| 68 views::Widget* target_widget_; | 68 views::Widget* target_widget_; |
| 69 const char* const native_window_property_; | 69 const char* const native_window_property_; |
| 70 | 70 |
| 71 DISALLOW_COPY_AND_ASSIGN(BrowserModalDialogHostObserverViews); | 71 DISALLOW_COPY_AND_ASSIGN(BrowserModalDialogHostObserverViews); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 ChromeWebModalDialogManagerDelegate* manager = browser; | 160 ChromeWebModalDialogManagerDelegate* manager = browser; |
| 161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); | 161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); |
| 162 DCHECK_EQ(parent, host->GetHostView()); | 162 DCHECK_EQ(parent, host->GetHostView()); |
| 163 ModalDialogHostObserver* dialog_host_observer = | 163 ModalDialogHostObserver* dialog_host_observer = |
| 164 new BrowserModalDialogHostObserverViews( | 164 new BrowserModalDialogHostObserverViews( |
| 165 host, widget, kBrowserModalDialogHostObserverViewsKey); | 165 host, widget, kBrowserModalDialogHostObserverViewsKey); |
| 166 dialog_host_observer->OnPositionRequiresUpdate(); | 166 dialog_host_observer->OnPositionRequiresUpdate(); |
| 167 } | 167 } |
| 168 return widget; | 168 return widget; |
| 169 } | 169 } |
| OLD | NEW |