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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 10829173: Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/webui_login_view.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 196 }
197 197
198 void WebUILoginView::UpdateWindowType() { 198 void WebUILoginView::UpdateWindowType() {
199 } 199 }
200 200
201 void WebUILoginView::LoadURL(const GURL & url) { 201 void WebUILoginView::LoadURL(const GURL & url) {
202 webui_login_->LoadInitialURL(url); 202 webui_login_->LoadInitialURL(url);
203 webui_login_->RequestFocus(); 203 webui_login_->RequestFocus();
204 204
205 CommandLine* command_line = CommandLine::ForCurrentProcess(); 205 CommandLine* command_line = CommandLine::ForCurrentProcess();
206 if (!command_line->HasSwitch(switches::kDisableNewOobe)) { 206 // Only enable transparency on sign in screen, not on lock screen.
207 if (BaseLoginDisplayHost::default_host() &&
208 !command_line->HasSwitch(switches::kDisableNewOobe)) {
207 // TODO(nkostylev): Use WebContentsObserver::RenderViewCreated to track 209 // TODO(nkostylev): Use WebContentsObserver::RenderViewCreated to track
208 // when RenderView is created. 210 // when RenderView is created.
209 // Use a background with transparency to trigger transparency in Webkit. 211 // Use a background with transparency to trigger transparency in Webkit.
210 SkBitmap background; 212 SkBitmap background;
211 background.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); 213 background.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
212 background.allocPixels(); 214 background.allocPixels();
213 background.eraseARGB(0x00, 0x00, 0x00, 0x00); 215 background.eraseARGB(0x00, 0x00, 0x00, 0x00);
214 content::RenderViewHost* host = 216 content::RenderViewHost* host =
215 tab_contents_->web_contents()->GetRenderViewHost(); 217 tab_contents_->web_contents()->GetRenderViewHost();
216 host->GetView()->SetBackground(background); 218 host->GetView()->SetBackground(background);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 aura::Env::GetInstance()->set_render_white_bg(true); 358 aura::Env::GetInstance()->set_render_white_bg(true);
357 } 359 }
358 360
359 void WebUILoginView::ReturnFocus(bool reverse) { 361 void WebUILoginView::ReturnFocus(bool reverse) {
360 // Return the focus to the web contents. 362 // Return the focus to the web contents.
361 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 363 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
362 GetWidget()->Activate(); 364 GetWidget()->Activate();
363 } 365 }
364 366
365 } // namespace chromeos 367 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/resources/chromeos/login/oobe.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698