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

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

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces 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
Index: chrome/browser/chromeos/login/background_view.cc
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 6b3871e5dee480ad0ba93d49c754d8e888426db1..71b1cdd06f07b53cbaf9de2ee7b8c5cc937d9447 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -129,6 +129,10 @@ views::Widget* BackgroundView::CreateWindowContainingView(
const gfx::Rect& bounds,
const GURL& background_url,
BackgroundView** view) {
+#if defined(USE_AURA)
+ // TODO(saintlou):
oshima 2011/09/19 15:52:39 I believe this will be gone
Emmanuel Saint-loubert-Bié 2011/09/19 20:15:36 Done.
+ return NULL;
+#else
Widget* window = new Widget;
Widget::InitParams params(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
params.bounds = bounds;
@@ -150,6 +154,7 @@ views::Widget* BackgroundView::CreateWindowContainingView(
LoginUtils::Get()->SetBackgroundView(*view);
return window;
+#endif
}
void BackgroundView::CreateModalPopup(views::WidgetDelegate* view) {

Powered by Google App Engine
This is Rietveld 408576698