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

Unified Diff: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h

Issue 8044018: Move chrome/browser/ui/touch/keyboard* to chrome/browser/ui/virtual_keyboard/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merged ToT Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h
diff --git a/chrome/browser/ui/touch/keyboard/keyboard_manager.h b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h
similarity index 68%
rename from chrome/browser/ui/touch/keyboard/keyboard_manager.h
rename to chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h
index 323b404647040a9cf72aef240f614d767da5d970..96aa6ede46865cc0a1704e770cdc19c0790ff94e 100644
--- a/chrome/browser/ui/touch/keyboard/keyboard_manager.h
+++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_TOUCH_KEYBOARD_KEYBOARD_MANAGER_H_
-#define CHROME_BROWSER_UI_TOUCH_KEYBOARD_KEYBOARD_MANAGER_H_
+#ifndef CHROME_BROWSER_UI_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_MANAGER_H_
+#define CHROME_BROWSER_UI_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_MANAGER_H_
#pragma once
#include "base/memory/singleton.h"
@@ -13,11 +13,11 @@
class KeyboardWidget;
// A singleton object to manage the virtual keyboard.
-class KeyboardManager : public views::Widget::Observer,
+class VirtualKeyboardManager : public views::Widget::Observer,
public views::desktop::DesktopWindowView::Observer {
public:
// Returns the singleton object.
- static KeyboardManager* GetInstance();
+ static VirtualKeyboardManager* GetInstance();
// Shows the keyboard for the target widget. The events from the keyboard will
// be sent to |widget|.
@@ -31,10 +31,10 @@ class KeyboardManager : public views::Widget::Observer,
views::Widget* keyboard();
private:
- friend struct DefaultSingletonTraits<KeyboardManager>;
+ friend struct DefaultSingletonTraits<VirtualKeyboardManager>;
- KeyboardManager();
- virtual ~KeyboardManager();
+ VirtualKeyboardManager();
+ virtual ~VirtualKeyboardManager();
// Overridden from views::Widget::Observer.
virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
@@ -44,7 +44,7 @@ class KeyboardManager : public views::Widget::Observer,
KeyboardWidget* keyboard_;
- DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
+ DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardManager);
};
-#endif // CHROME_BROWSER_UI_TOUCH_KEYBOARD_KEYBOARD_MANAGER_H_
+#endif // CHROME_BROWSER_UI_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_MANAGER_H_
« no previous file with comments | « chrome/browser/ui/touch/status_bubble_touch.cc ('k') | chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698