Re-lands 58186:

app/keyboard_code_conversion_gtk.cc

 // Copyright (c) 2009 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.
 
 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * Copyright (C) 2008 Collabora, Ltd.  All rights reserved.
  * Copyright (C) 2008, 2009 Google Inc.
@@ skipping 15 matching lines @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // WindowsKeyCodeForGdkKeyCode is copied from platform/gtk/KeyEventGtk.cpp
 
-#include "base/keyboard_code_conversion_gtk.h"
+#include "app/keyboard_code_conversion_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
-#include "base/keyboard_codes_posix.h"
+#include "app/keyboard_codes_posix.h"
 
-namespace base {
+namespace app {
 
-base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
+app::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
   switch (keycode) {
     case GDK_KP_0:
       return VKEY_NUMPAD0;  // (60) Numeric keypad 0 key
     case GDK_KP_1:
       return VKEY_NUMPAD1;  // (61) Numeric keypad 1 key
     case GDK_KP_2:
       return  VKEY_NUMPAD2;  // (62) Numeric keypad 2 key
     case GDK_KP_3:
       return VKEY_NUMPAD3;  // (63) Numeric keypad 3 key
     case GDK_KP_4:
@@ skipping 341 matching lines @@
     case GDK_F15:
     case GDK_F16:
     case GDK_F17:
     case GDK_F18:
     case GDK_F19:
     case GDK_F20:
     case GDK_F21:
     case GDK_F22:
     case GDK_F23:
     case GDK_F24:
-      return static_cast<base::KeyboardCode>(VKEY_F1 + (keycode - GDK_F1));
+      return static_cast<app::KeyboardCode>(VKEY_F1 + (keycode - GDK_F1));
     default:
       return VKEY_UNKNOWN;
     }
 }
 
 // TODO(jcampan): this method might be incomplete.
-int GdkKeyCodeForWindowsKeyCode(base::KeyboardCode keycode, bool shift) {
+int GdkKeyCodeForWindowsKeyCode(app::KeyboardCode keycode, bool shift) {
   switch (keycode) {
     case VKEY_NUMPAD0:
       return GDK_KP_0;
     case VKEY_NUMPAD1:
       return GDK_KP_1;
     case VKEY_NUMPAD2:
       return GDK_KP_2;
     case VKEY_NUMPAD3:
       return GDK_KP_3;
     case VKEY_NUMPAD4:
@@ skipping 183 matching lines @@
     case VKEY_F22:
     case VKEY_F23:
     case VKEY_F24:
       return GDK_F1 + (keycode - VKEY_F1);
 
     default:
       return 0;
     }
 }
 
-}  // namespace base
+}  // namespace app