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

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window_view.h

Issue 8879023: Reverting 8833008 which breaks CandidateWindowViewTest.MozcUpdateCandidateTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « no previous file | chrome/browser/chromeos/input_method/candidate_window_view_unittest.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
7 7
8 #include "base/gtest_prod_util.h"
9 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h" 8 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
10 #include "ui/views/view.h" 9 #include "ui/views/view.h"
11 10
12 namespace chromeos { 11 namespace chromeos {
13 namespace input_method { 12 namespace input_method {
14 13
15 class CandidateView; 14 class CandidateView;
16 class InformationTextArea; 15 class InformationTextArea;
17 class HidableArea; 16 class HidableArea;
18 17
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 const gfx::Rect& cursor_location() const { return cursor_location_; } 126 const gfx::Rect& cursor_location() const { return cursor_location_; }
128 127
129 protected: 128 protected:
130 // Override View::VisibilityChanged() 129 // Override View::VisibilityChanged()
131 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; 130 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
132 131
133 // Override View::OnBoundsChanged() 132 // Override View::OnBoundsChanged()
134 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 133 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
135 134
136 private: 135 private:
137 FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, MozcUpdateCandidateTest);
138
139 // Initializes the candidate views if needed. 136 // Initializes the candidate views if needed.
140 void MaybeInitializeCandidateViews( 137 void MaybeInitializeCandidateViews(
141 const InputMethodLookupTable& lookup_table); 138 const InputMethodLookupTable& lookup_table);
142 139
143 // Returns the appropriate area (header or footer) to put auxiliary texts. 140 // Returns the appropriate area (header or footer) to put auxiliary texts.
144 InformationTextArea* GetAuxiliaryTextArea(); 141 InformationTextArea* GetAuxiliaryTextArea();
145 142
146 bool IsCandidateWindowOpen() const; 143 bool IsCandidateWindowOpen() const;
147 144
148 // The lookup table (candidates). 145 // The lookup table (candidates).
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 192
196 bool is_suggestion_window_location_available_; 193 bool is_suggestion_window_location_available_;
197 194
198 DISALLOW_COPY_AND_ASSIGN(CandidateWindowView); 195 DISALLOW_COPY_AND_ASSIGN(CandidateWindowView);
199 }; 196 };
200 197
201 } // namespace input_method 198 } // namespace input_method
202 } // namespace chromeos 199 } // namespace chromeos
203 200
204 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_ 201 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698