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

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

Issue 10537022: Temporary fix for Infolist font issue. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/input_method/candidate_window.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
11 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h" 11 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
12 #include "ui/views/view.h" 12 #include "ui/views/view.h"
13 13
14 namespace gfx {
15 class Font;
16 }
17
14 namespace chromeos { 18 namespace chromeos {
15 namespace input_method { 19 namespace input_method {
16 20
17 class CandidateView; 21 class CandidateView;
18 class InfolistView; 22 class InfolistView;
19 class InformationTextArea; 23 class InformationTextArea;
20 class HidableArea; 24 class HidableArea;
21 25
22 // CandidateWindowView is the main container of the candidate window UI. 26 // CandidateWindowView is the main container of the candidate window UI.
23 class CandidateWindowView : public views::View { 27 class CandidateWindowView : public views::View {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 public: 227 public:
224 InfolistWindowView(views::Widget* parent_frame, 228 InfolistWindowView(views::Widget* parent_frame,
225 views::Widget* candidate_window_frame); 229 views::Widget* candidate_window_frame);
226 virtual ~InfolistWindowView(); 230 virtual ~InfolistWindowView();
227 void Init(); 231 void Init();
228 void Show(); 232 void Show();
229 void DelayShow(unsigned int milliseconds); 233 void DelayShow(unsigned int milliseconds);
230 void Hide(); 234 void Hide();
231 void DelayHide(unsigned int milliseconds); 235 void DelayHide(unsigned int milliseconds);
232 void UpdateCandidates(const InputMethodLookupTable& lookup_table); 236 void UpdateCandidates(const InputMethodLookupTable& lookup_table);
233
234 void ResizeAndMoveParentFrame(); 237 void ResizeAndMoveParentFrame();
238 gfx::Font GetTitleFont() const;
239 gfx::Font GetDescriptionFont() const;
235 240
236 protected: 241 protected:
237 // Override View::VisibilityChanged() 242 // Override View::VisibilityChanged()
238 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; 243 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
239 244
240 // Override View::OnBoundsChanged() 245 // Override View::OnBoundsChanged()
241 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 246 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
242 247
243 private: 248 private:
244 FRIEND_TEST_ALL_PREFIXES(InfolistWindowViewTest, ShouldUpdateViewTest); 249 FRIEND_TEST_ALL_PREFIXES(InfolistWindowViewTest, ShouldUpdateViewTest);
(...skipping 17 matching lines...) Expand all
262 std::vector<InfolistView*> infolist_views_; 267 std::vector<InfolistView*> infolist_views_;
263 268
264 bool visible_; 269 bool visible_;
265 270
266 base::OneShotTimer<InfolistWindowView> show_hide_timer_; 271 base::OneShotTimer<InfolistWindowView> show_hide_timer_;
267 272
268 static bool ShouldUpdateView( 273 static bool ShouldUpdateView(
269 const mozc::commands::InformationList* old_usages, 274 const mozc::commands::InformationList* old_usages,
270 const mozc::commands::InformationList* new_usages); 275 const mozc::commands::InformationList* new_usages);
271 276
277 // Information title font
278 scoped_ptr<gfx::Font> title_font_;
279 // Information description font
280 scoped_ptr<gfx::Font> description_font_;
281
272 DISALLOW_COPY_AND_ASSIGN(InfolistWindowView); 282 DISALLOW_COPY_AND_ASSIGN(InfolistWindowView);
273 }; 283 };
274 284
275 } // namespace input_method 285 } // namespace input_method
276 } // namespace chromeos 286 } // namespace chromeos
277 287
278 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_ 288 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/candidate_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698