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

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

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
6 6
7 #include "ash/common/focus_cycler.h" 7 #include "ash/common/focus_cycler.h"
8 #include "ash/common/system/tray/system_tray.h" 8 #include "ash/common/system/tray/system_tray.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 const ui::Accelerator& accelerator) { 298 const ui::Accelerator& accelerator) {
299 AccelMap::const_iterator entry = accel_map_.find(accelerator); 299 AccelMap::const_iterator entry = accel_map_.find(accelerator);
300 if (entry == accel_map_.end()) 300 if (entry == accel_map_.end())
301 return false; 301 return false;
302 302
303 if (!web_view()) 303 if (!web_view())
304 return true; 304 return true;
305 305
306 content::WebUI* web_ui = GetWebUI(); 306 content::WebUI* web_ui = GetWebUI();
307 if (web_ui) { 307 if (web_ui) {
308 base::StringValue accel_name(entry->second); 308 base::Value accel_name(entry->second);
309 web_ui->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator", 309 web_ui->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
310 accel_name); 310 accel_name);
311 } 311 }
312 312
313 return true; 313 return true;
314 } 314 }
315 315
316 gfx::NativeWindow WebUILoginView::GetNativeWindow() const { 316 gfx::NativeWindow WebUILoginView::GetNativeWindow() const {
317 return GetWidget()->GetNativeWindow(); 317 return GetWidget()->GetNativeWindow();
318 } 318 }
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 if (should_emit_login_prompt_visible_) { 508 if (should_emit_login_prompt_visible_) {
509 VLOG(1) << "Login WebUI >> login-prompt-visible"; 509 VLOG(1) << "Login WebUI >> login-prompt-visible";
510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
511 EmitLoginPromptVisible(); 511 EmitLoginPromptVisible();
512 } 512 }
513 513
514 webui_visible_ = true; 514 webui_visible_ = true;
515 } 515 }
516 516
517 } // namespace chromeos 517 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698