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

Unified Diff: trunk/src/chrome/browser/chromeos/input_method/candidate_view.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/input_method/candidate_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/input_method/candidate_view.h
===================================================================
--- trunk/src/chrome/browser/chromeos/input_method/candidate_view.h (revision 243783)
+++ trunk/src/chrome/browser/chromeos/input_method/candidate_view.h (working copy)
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_VIEW_H_
#include "base/gtest_prod_util.h"
-#include "ui/base/ime/candidate_window.h"
+#include "chromeos/ime/candidate_window.h"
#include "ui/views/controls/button/custom_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/view.h"
@@ -18,7 +18,7 @@
class CandidateView : public views::CustomButton {
public:
CandidateView(views::ButtonListener* listener,
- ui::CandidateWindow::Orientation orientation);
+ CandidateWindow::Orientation orientation);
virtual ~CandidateView() {}
void GetPreferredWidths(int* shortcut_width,
@@ -27,7 +27,7 @@
void SetWidths(int shortcut_width,
int candidate_width);
- void SetEntry(const ui::CandidateWindow::Entry& entry);
+ void SetEntry(const CandidateWindow::Entry& entry);
// Sets infolist icon.
void SetInfolistIcon(bool enable);
@@ -45,7 +45,7 @@
virtual gfx::Size GetPreferredSize() OVERRIDE;
// The orientation of the candidate view.
- ui::CandidateWindow::Orientation orientation_;
+ CandidateWindow::Orientation orientation_;
// Views created in the class will be part of tree of |this|, so these
// child views will be deleted when |this| is deleted.
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/input_method/candidate_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698