Chromium Code Reviews| Index: ash/screensaver/screensaver_view.cc |
| diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc |
| index d42b50dfd3ea6c7c8ce755bfd86402e097fa0fb8..0ebca421e779f6fcb3642be136b356f99c0e6f4e 100644 |
| --- a/ash/screensaver/screensaver_view.cc |
| +++ b/ash/screensaver/screensaver_view.cc |
| @@ -39,6 +39,10 @@ void CloseScreensaver() { |
| internal::ScreensaverView::CloseScreensaver(); |
| } |
| +bool IsScreensaverShown() { |
| + return internal::ScreensaverView::IsScreensaverShown(); |
| +} |
| + |
| namespace internal { |
| // static |
| @@ -56,6 +60,23 @@ void ScreensaverView::CloseScreensaver() { |
| g_instance = NULL; |
| } |
| } |
| +// static |
| +bool ScreensaverView::IsScreensaverShown() { |
| + if (g_instance) |
|
Matt Perry
2013/01/31 00:37:23
nit: can simplify to "return g_instance && g_insta
rkc
2013/01/31 02:15:46
Done.
|
| + return g_instance->IsScreensaverShowingURL(g_instance->url_); |
| + else |
| + return false; |
| +} |
| + |
| +bool ScreensaverView::IsScreensaverShowingURL(const GURL& url) { |
| + if (screensaver_webview_ && |
| + screensaver_webview_->web_contents() && |
| + screensaver_webview_->web_contents()->GetURL() == url) { |
|
Matt Perry
2013/01/31 00:37:23
ditto, just return this expression
rkc
2013/01/31 02:15:46
Done.
|
| + return true; |
| + } else { |
| + return false; |
| + } |
| +} |
| //////////////////////////////////////////////////////////////////////////////// |
| // ScreensaverView, views::WidgetDelegateView implementation. |