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

Unified Diff: chrome/browser/screensaver_window_finder_gtk.cc

Issue 7945014: Applied review comments from oshima for CL 7850026. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 3 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 | « chrome/browser/screensaver_window_finder_gtk.h ('k') | chrome/browser/screensaver_window_finder_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/screensaver_window_finder_gtk.cc
diff --git a/chrome/browser/screensaver_window_finder_linux.cc b/chrome/browser/screensaver_window_finder_gtk.cc
similarity index 92%
rename from chrome/browser/screensaver_window_finder_linux.cc
rename to chrome/browser/screensaver_window_finder_gtk.cc
index e43b2d85e2513e51dc57447af1361ac64ecb8720..a94f3230e63eb462fccfbe65a1a6061411b10f38 100644
--- a/chrome/browser/screensaver_window_finder_linux.cc
+++ b/chrome/browser/screensaver_window_finder_gtk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/screensaver_window_finder_linux.h"
+#include "chrome/browser/screensaver_window_finder_gtk.h"
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -17,15 +17,11 @@ ScreensaverWindowFinder::ScreensaverWindowFinder()
}
bool ScreensaverWindowFinder::ScreensaverWindowExists() {
-#if defined(USE_AURA)
- return false;
-#else
gdk_error_trap_push();
ScreensaverWindowFinder finder;
gtk_util::EnumerateTopLevelWindows(&finder);
bool got_error = gdk_error_trap_pop();
return finder.exists_ && !got_error;
-#endif
}
bool ScreensaverWindowFinder::ShouldStopIterating(XID window) {
« no previous file with comments | « chrome/browser/screensaver_window_finder_gtk.h ('k') | chrome/browser/screensaver_window_finder_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698