| Index: chrome/browser/managed_mode/managed_mode_navigation_observer.cc
|
| ===================================================================
|
| --- chrome/browser/managed_mode/managed_mode_navigation_observer.cc (revision 195254)
|
| +++ chrome/browser/managed_mode/managed_mode_navigation_observer.cc (working copy)
|
| @@ -138,7 +138,7 @@
|
| }
|
|
|
| bool ManagedModeWarningInfobarDelegate::Accept() {
|
| - GoBackToSafety(owner()->GetWebContents());
|
| + GoBackToSafety(owner()->web_contents());
|
|
|
| return false;
|
| }
|
| @@ -156,7 +156,7 @@
|
|
|
| void ManagedModeWarningInfobarDelegate::InfoBarDismissed() {
|
| ManagedModeNavigationObserver* observer =
|
| - ManagedModeNavigationObserver::FromWebContents(owner()->GetWebContents());
|
| + ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
|
| observer->WarnInfobarDismissed();
|
| }
|
|
|
| @@ -216,8 +216,7 @@
|
|
|
| bool ManagedModePreviewInfobarDelegate::Accept() {
|
| ManagedModeNavigationObserver* observer =
|
| - ManagedModeNavigationObserver::FromWebContents(
|
| - owner()->GetWebContents());
|
| + ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
|
| UMA_HISTOGRAM_ENUMERATION("ManagedMode.PreviewInfobarCommand",
|
| INFOBAR_ACCEPT,
|
| INFOBAR_HISTOGRAM_BOUNDING_VALUE);
|
| @@ -227,12 +226,11 @@
|
|
|
| bool ManagedModePreviewInfobarDelegate::Cancel() {
|
| ManagedModeNavigationObserver* observer =
|
| - ManagedModeNavigationObserver::FromWebContents(
|
| - owner()->GetWebContents());
|
| + ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
|
| UMA_HISTOGRAM_ENUMERATION("ManagedMode.PreviewInfobarCommand",
|
| INFOBAR_CANCEL,
|
| INFOBAR_HISTOGRAM_BOUNDING_VALUE);
|
| - GoBackToSafety(owner()->GetWebContents());
|
| + GoBackToSafety(owner()->web_contents());
|
| observer->ClearObserverState();
|
| return false;
|
| }
|
| @@ -245,8 +243,7 @@
|
|
|
| void ManagedModePreviewInfobarDelegate::InfoBarDismissed() {
|
| ManagedModeNavigationObserver* observer =
|
| - ManagedModeNavigationObserver::FromWebContents(
|
| - owner()->GetWebContents());
|
| + ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
|
| observer->PreviewInfobarDismissed();
|
| }
|
|
|
|
|