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

Side by Side Diff: ui/base/ime/candidate_window.h

Issue 126363002: Moves CandidateWindow model to ui/base/ime. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/ime/candidate_window_unittest.cc ('k') | ui/base/ime/candidate_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_IME_CANDIDATE_WINDOW_H_ 5 #ifndef UI_BASE_IME_CANDIDATE_WINDOW_H_
6 #define CHROMEOS_IME_CANDIDATE_WINDOW_H_ 6 #define UI_BASE_IME_CANDIDATE_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "chromeos/chromeos_export.h" 12 #include "ui/base/ui_base_export.h"
13 13
14 namespace chromeos { 14 namespace ui {
Hiro Komatsu 2014/01/08 03:51:26 What do you think to add "ime" namespace? (i.e. u
Jun Mukai 2014/01/08 05:04:32 I am not so sure about the namespace policy. There
15 namespace input_method {
16 15
17 // CandidateWindow represents the structure of candidates generated from IME. 16 // CandidateWindow represents the structure of candidates generated from IME.
18 class CHROMEOS_EXPORT CandidateWindow { 17 class UI_BASE_EXPORT CandidateWindow {
19 public: 18 public:
20 enum Orientation { 19 enum Orientation {
21 HORIZONTAL = 0, 20 HORIZONTAL = 0,
22 VERTICAL = 1, 21 VERTICAL = 1,
23 }; 22 };
24 23
25 struct CandidateWindowProperty { 24 struct CandidateWindowProperty {
26 CandidateWindowProperty(); 25 CandidateWindowProperty();
27 virtual ~CandidateWindowProperty(); 26 virtual ~CandidateWindowProperty();
28 int page_size; 27 int page_size;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 property_->show_window_at_composition = show_window_at_composition; 113 property_->show_window_at_composition = show_window_at_composition;
115 } 114 }
116 115
117 private: 116 private:
118 scoped_ptr<CandidateWindowProperty> property_; 117 scoped_ptr<CandidateWindowProperty> property_;
119 std::vector<Entry> candidates_; 118 std::vector<Entry> candidates_;
120 119
121 DISALLOW_COPY_AND_ASSIGN(CandidateWindow); 120 DISALLOW_COPY_AND_ASSIGN(CandidateWindow);
122 }; 121 };
123 122
124 } // namespace input_method 123 } // namespace ui
125 } // namespace chromeos
126 124
127 #endif // CHROMEOS_IME_CANDIDATE_WINDOW_H_ 125 #endif // UI_BASE_IME_CANDIDATE_WINDOW_H_
OLDNEW
« no previous file with comments | « chromeos/ime/candidate_window_unittest.cc ('k') | ui/base/ime/candidate_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698