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

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

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 19 matching lines...) Expand all
30 #if defined(TOOLKIT_USES_GTK) 30 #if defined(TOOLKIT_USES_GTK)
31 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" 31 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
32 #include "ui/views/widget/native_widget_gtk.h" 32 #include "ui/views/widget/native_widget_gtk.h"
33 #endif 33 #endif
34 34
35 #if defined(USE_VIRTUAL_KEYBOARD) 35 #if defined(USE_VIRTUAL_KEYBOARD)
36 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h" 36 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
37 #endif 37 #endif
38 38
39 #if defined(USE_AURA) 39 #if defined(USE_AURA)
40 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 40 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
41 #endif 41 #endif
42 42
43 using content::WebContents; 43 using content::WebContents;
44 44
45 namespace { 45 namespace {
46 46
47 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView"; 47 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
48 48
49 // These strings must be kept in sync with handleAccelerator() in oobe.js. 49 // These strings must be kept in sync with handleAccelerator() in oobe.js.
50 const char kAccelNameAccessibility[] = "accessibility"; 50 const char kAccelNameAccessibility[] = "accessibility";
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding 423 // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding
424 // an immediate authentication error (See crbug.com/103643). 424 // an immediate authentication error (See crbug.com/103643).
425 if (event.type == WebKit::WebInputEvent::KeyDown) { 425 if (event.type == WebKit::WebInputEvent::KeyDown) {
426 content::WebUI* web_ui = GetWebUI(); 426 content::WebUI* web_ui = GetWebUI();
427 if (web_ui) 427 if (web_ui)
428 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors"); 428 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
429 } 429 }
430 } 430 }
431 431
432 } // namespace chromeos 432 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698