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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/chromeos/ime/candidate_window.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:

« no previous file with comments | « trunk/src/chromeos/chromeos.gyp ('k') | trunk/src/chromeos/ime/candidate_window.cc » ('j') | no next file with comments »

OLD	NEW
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 CHROMEOS_IME_CANDIDATE_WINDOW_H_

6 #define CHROMEOS_IME_CANDIDATE_WINDOW_H_	6 #define CHROMEOS_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"

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118 scoped_ptr<CandidateWindowProperty> property_;	118 scoped_ptr<CandidateWindowProperty> property_;

119 std::vector<Entry> candidates_;	119 std::vector<Entry> candidates_;

120	120

121 DISALLOW_COPY_AND_ASSIGN(CandidateWindow);	121 DISALLOW_COPY_AND_ASSIGN(CandidateWindow);

122 };	122 };

123	123

124 } // namespace input_method	124 } // namespace input_method

125 } // namespace chromeos	125 } // namespace chromeos

126	126

127 #endif // CHROMEOS_IME_CANDIDATE_WINDOW_H_	127 #endif // CHROMEOS_IME_CANDIDATE_WINDOW_H_

OLD	NEW