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

Unified Diff: chrome/browser/chromeos/login/helper.cc

Issue 6973029: Integrate WebUI Login with cros. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated code in response to review comments Created 9 years, 7 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
Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 7170401bf6b31c0b935a767c77434aad83ee8755..b53eb0bab745087838fb020b11cdfab6ea882de8 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <X11/cursorfont.h>
+#include <X11/Xcursor/Xcursor.h>
+
#include "chrome/browser/chromeos/login/helper.h"
#include "base/file_util.h"
@@ -14,6 +17,7 @@
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/x/x11_util.h"
#include "ui/gfx/canvas_skia.h"
#include "views/controls/button/menu_button.h"
#include "views/controls/button/native_button.h"
@@ -218,6 +222,16 @@ string16 GetCurrentNetworkName(NetworkLibrary* network_library) {
}
}
+void ResetXCursor() {
+ // TODO(sky): nuke this once new window manager is in place.
oshima 2011/05/19 01:45:19 can you double chceck with Dan (derat) if this is
rharrison 2011/05/19 16:45:28 Sent him an e-mail, awaiting a response.
+ Display* display = ui::GetXDisplay();
+ Cursor cursor = XCreateFontCursor(display, XC_left_ptr);
+ XID root_window = ui::GetX11RootWindow();
+ XSetWindowAttributes attr;
+ attr.cursor = cursor;
+ XChangeWindowAttributes(display, root_window, CWCursor, &attr);
+}
+
namespace login {
gfx::Size WideButton::GetPreferredSize() {

Powered by Google App Engine
This is Rietveld 408576698