Commit e4d18f92 authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Commit Bot

Remove {Set,Get}OverrideContentUrl in keyboard_util.h.

The definitions of these functions were already removed in
crrev.com/1392713002.

Bug: N/A
Test: Build.
Change-Id: Ic1ee7288776f5d6fb472057f69378303ba10ec21
Reviewed-on: https://chromium-review.googlesource.com/821973
Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarShu Chen <shuchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524655}
parent 53cbd69b
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#include "ui/events/event_utils.h" #include "ui/events/event_utils.h"
#include "ui/events/keycodes/dom/dom_code.h" #include "ui/events/keycodes/dom/dom_code.h"
#include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/keyboard/content/keyboard_content_util.h"
#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
using input_method::InputMethodEngineBase; using input_method::InputMethodEngineBase;
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
#include "ui/base/ime/ime_bridge.h" #include "ui/base/ime/ime_bridge.h"
#include "ui/chromeos/ime/input_method_menu_item.h" #include "ui/chromeos/ime/input_method_menu_item.h"
#include "ui/chromeos/ime/input_method_menu_manager.h" #include "ui/chromeos/ime/input_method_menu_manager.h"
#include "ui/keyboard/content/keyboard_content_util.h"
#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
namespace chromeos { namespace chromeos {
namespace input_method { namespace input_method {
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include "ui/base/ime/chromeos/extension_ime_util.h" #include "ui/base/ime/chromeos/extension_ime_util.h"
#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/base/ime/ime_engine_handler_interface.h" #include "ui/base/ime/ime_engine_handler_interface.h"
#include "ui/keyboard/content/keyboard_content_util.h"
#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
namespace input_ime = extensions::api::input_ime; namespace input_ime = extensions::api::input_ime;
namespace DeleteSurroundingText = namespace DeleteSurroundingText =
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/insets.h"
#include "ui/keyboard/content/keyboard_constants.h" #include "ui/keyboard/content/keyboard_constants.h"
#include "ui/keyboard/content/keyboard_content_util.h"
#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_controller_observer.h" #include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/keyboard/keyboard_switches.h" #include "ui/keyboard/keyboard_switches.h"
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method.h"
#include "ui/base/ime/input_method_factory.h" #include "ui/base/ime/input_method_factory.h"
#include "ui/keyboard/content/keyboard_constants.h" #include "ui/keyboard/content/keyboard_constants.h"
#include "ui/keyboard/content/keyboard_content_util.h"
#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_switches.h" #include "ui/keyboard/keyboard_switches.h"
#include "ui/keyboard/keyboard_test_util.h" #include "ui/keyboard/keyboard_test_util.h"
#include "ui/keyboard/keyboard_ui.h" #include "ui/keyboard/keyboard_ui.h"
#include "ui/keyboard/keyboard_util.h"
namespace { namespace {
const int kKeyboardHeightForTest = 100; const int kKeyboardHeightForTest = 100;
......
...@@ -14,8 +14,6 @@ namespace aura { ...@@ -14,8 +14,6 @@ namespace aura {
class WindowTreeHost; class WindowTreeHost;
} }
class GURL;
namespace keyboard { namespace keyboard {
// For virtual keyboard IME extension. // For virtual keyboard IME extension.
...@@ -172,13 +170,6 @@ KEYBOARD_EXPORT void MarkKeyboardLoadStarted(); ...@@ -172,13 +170,6 @@ KEYBOARD_EXPORT void MarkKeyboardLoadStarted();
// keyboard is loaded. // keyboard is loaded.
KEYBOARD_EXPORT void MarkKeyboardLoadFinished(); KEYBOARD_EXPORT void MarkKeyboardLoadFinished();
// Sets the override content url.
// This is used by for input view for extension IMEs.
KEYBOARD_EXPORT void SetOverrideContentUrl(const GURL& url);
// Gets the override content url.
KEYBOARD_EXPORT const GURL& GetOverrideContentUrl();
// Logs the keyboard control event as a UMA stat. // Logs the keyboard control event as a UMA stat.
void LogKeyboardControlEvent(KeyboardControlEvent event); void LogKeyboardControlEvent(KeyboardControlEvent event);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment