Re-lands 58186:

app/keyboard_code_conversion_gtk.h

 // 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
 
-#ifndef BASE_KEYBOARD_CODE_CONVERSION_GTK_H_
-#define BASE_KEYBOARD_CODE_CONVERSION_GTK_H_
+#ifndef APP_KEYBOARD_CODE_CONVERSION_GTK_H_
+#define APP_KEYBOARD_CODE_CONVERSION_GTK_H_
 #pragma once
 
-#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);
 
-int GdkKeyCodeForWindowsKeyCode(base::KeyboardCode keycode, bool shift);
+int GdkKeyCodeForWindowsKeyCode(app::KeyboardCode keycode, bool shift);
 
 } // namespace
 
-#endif  // BASE_KEYBOARD_CODE_CONVERSION_GTK_H_
+#endif  // APP_KEYBOARD_CODE_CONVERSION_GTK_H_