Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
@@ skipping 68 matching lines @@
 
 // RootView of the Widget WizardController creates. Contains the contents of the
 // WizardController.
 class ContentView : public views::View {
  public:
   ContentView(int window_x, int window_y, int screen_w, int screen_h)
       : window_x_(window_x),
         window_y_(window_y),
         screen_w_(screen_w),
         screen_h_(screen_h),
-        accel_account_screen_(views::Accelerator(app::VKEY_A,
+        accel_account_screen_(views::Accelerator(base::VKEY_A,
                                                  false, true, true)),
-        accel_login_screen_(views::Accelerator(app::VKEY_L,
+        accel_login_screen_(views::Accelerator(base::VKEY_L,
                                                false, true, true)),
-        accel_network_screen_(views::Accelerator(app::VKEY_N,
+        accel_network_screen_(views::Accelerator(base::VKEY_N,
                                                  false, true, true)),
-        accel_update_screen_(views::Accelerator(app::VKEY_U,
+        accel_update_screen_(views::Accelerator(base::VKEY_U,
                                                 false, true, true)),
-        accel_image_screen_(views::Accelerator(app::VKEY_I,
+        accel_image_screen_(views::Accelerator(base::VKEY_I,
                                                false, true, true)),
-        accel_eula_screen_(views::Accelerator(app::VKEY_E,
+        accel_eula_screen_(views::Accelerator(base::VKEY_E,
                                               false, true, true)),
-        accel_register_screen_(views::Accelerator(app::VKEY_R,
+        accel_register_screen_(views::Accelerator(base::VKEY_R,
                                                   false, true, true)),
         accel_enable_accessibility_(views::Accelerator(
             WizardAccessibilityHelper::accelerator, false, true, true)) {
     AddAccelerator(accel_account_screen_);
     AddAccelerator(accel_login_screen_);
     AddAccelerator(accel_network_screen_);
     AddAccelerator(accel_update_screen_);
     AddAccelerator(accel_image_screen_);
     AddAccelerator(accel_eula_screen_);
     AddAccelerator(accel_register_screen_);
@@ skipping 788 matching lines @@
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
     }
   }
 }
 
 }  // namespace browser