summaryrefslogtreecommitdiffstats
path: root/components/html_viewer/ime_controller.h
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-09-16 19:48:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-17 02:49:24 +0000
commit35b19f7d5d7b7b68878d6c766e93e148f8b06998 (patch)
tree546289030a5e80740af920e59ce31827d907bd2a /components/html_viewer/ime_controller.h
parenteef6f20ef572c4c128612384a63384aaa7d23fe7 (diff)
downloadchromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.zip
chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.gz
chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.bz2
Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )
Reason for revert: Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066 Original issue's description: > Mandoline UI Process: Update namespaces and file names > > This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager. > > BUG=531533 > TBR=jam@chromium.org for trivial pdf_viewer change. > > Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed > Cr-Commit-Position: refs/heads/master@{#349229} TBR=sky@chromium.org,fsamuel@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=531533 Review URL: https://codereview.chromium.org/1351013002 Cr-Commit-Position: refs/heads/master@{#349332}
Diffstat (limited to 'components/html_viewer/ime_controller.h')
-rw-r--r--components/html_viewer/ime_controller.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/html_viewer/ime_controller.h b/components/html_viewer/ime_controller.h
index 24923ab..8c2917f 100644
--- a/components/html_viewer/ime_controller.h
+++ b/components/html_viewer/ime_controller.h
@@ -12,7 +12,7 @@ class WebGestureEvent;
class WebWidget;
}
-namespace mus {
+namespace mojo {
class View;
}
@@ -22,7 +22,7 @@ namespace html_viewer {
// handling IME related stuff.
class ImeController {
public:
- ImeController(mus::View* view, blink::WebWidget* widget);
+ ImeController(mojo::View* view, blink::WebWidget* widget);
~ImeController();
// Methods called by WebWidget overrides.
@@ -33,13 +33,13 @@ class ImeController {
void ShowImeIfNeeded();
private:
- // Update text input state from WebWidget to mus::View. If the focused
+ // Update text input state from WebWidget to mojo::View. If the focused
// element is editable and |show_ime| is True, the software keyboard will be
// shown.
void UpdateTextInputState(bool show_ime);
// Not owned objects.
- mus::View* view_;
+ mojo::View* view_;
blink::WebWidget* widget_;
blink::WebTextInputInfo text_input_info_;