Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1200)

Unified Diff: ash/screensaver/screensaver_view.cc

Issue 12093058: Screensaver implementation for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fixes. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | ash/screensaver/screensaver_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screensaver/screensaver_view.cc
diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc
index d42b50dfd3ea6c7c8ce755bfd86402e097fa0fb8..d439e52425dc419d0bca17a169831182aee35336 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
@@ -57,6 +61,17 @@ void ScreensaverView::CloseScreensaver() {
}
}
+// static
+bool ScreensaverView::IsScreensaverShown() {
+ return g_instance && g_instance->IsScreensaverShowingURL(g_instance->url_);
+}
+
+bool ScreensaverView::IsScreensaverShowingURL(const GURL& url) {
+ return screensaver_webview_ &&
+ screensaver_webview_->web_contents() &&
+ (screensaver_webview_->web_contents()->GetURL() == url);
+}
+
////////////////////////////////////////////////////////////////////////////////
// ScreensaverView, views::WidgetDelegateView implementation.
views::View* ScreensaverView::GetContentsView() {
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | ash/screensaver/screensaver_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698