trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h - Issue 130833002: Revert 243777 "Moves CandidateWindow model to ui/base/ime."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h

Issue 130833002: Revert 243777 "Moves CandidateWindow model to ui/base/ime." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 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:

Index: trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h

===================================================================

--- trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h (revision 243783)

+++ trunk/src/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h (working copy)

@@ -5,7 +5,7 @@

#ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_CANDIDATE_WINDOW_HANDLER_H_

#define UI_BASE_IME_CHROMEOS_MOCK_IME_CANDIDATE_WINDOW_HANDLER_H_

-#include "ui/base/ime/candidate_window.h"

+#include "chromeos/ime/candidate_window.h"

#include "ui/base/ime/chromeos/ibus_bridge.h"

#include "ui/base/ui_base_export.h"

@@ -15,7 +15,7 @@

: public IBusPanelCandidateWindowHandlerInterface {

public:

struct UpdateLookupTableArg {

- ui::CandidateWindow lookup_table;

+ input_method::CandidateWindow lookup_table;

bool is_visible;

};

@@ -29,7 +29,7 @@

// IBusPanelCandidateWindowHandlerInterface override.

virtual void UpdateLookupTable(

- const ui::CandidateWindow& candidate_window,

+ const input_method::CandidateWindow& candidate_window,

bool visible) OVERRIDE;

virtual void UpdatePreeditText(const std::string& text, uint32 cursor_pos,

bool visible) OVERRIDE;