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

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
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"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 public: 223 public:
224 InfolistWindowView(views::Widget* parent_frame, 224 InfolistWindowView(views::Widget* parent_frame,
225 views::Widget* candidate_window_frame); 225 views::Widget* candidate_window_frame);
226 virtual ~InfolistWindowView(); 226 virtual ~InfolistWindowView();
227 void Init(); 227 void Init();
228 void Show(); 228 void Show();
229 void DelayShow(unsigned int milliseconds); 229 void DelayShow(unsigned int milliseconds);
230 void Hide(); 230 void Hide();
231 void DelayHide(unsigned int milliseconds); 231 void DelayHide(unsigned int milliseconds);
232 void UpdateCandidates(const InputMethodLookupTable& lookup_table); 232 void UpdateCandidates(const InputMethodLookupTable& lookup_table);
233
234 void ResizeAndMoveParentFrame(); 233 void ResizeAndMoveParentFrame();
234 gfx::Font GetTitleFont();
235 gfx::Font GetDescriptionFont();
235 236
236 protected: 237 protected:
237 // Override View::VisibilityChanged() 238 // Override View::VisibilityChanged()
238 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; 239 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
239 240
240 // Override View::OnBoundsChanged() 241 // Override View::OnBoundsChanged()
241 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 242 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
242 243
243 private: 244 private:
244 FRIEND_TEST_ALL_PREFIXES(InfolistWindowViewTest, ShouldUpdateViewTest); 245 FRIEND_TEST_ALL_PREFIXES(InfolistWindowViewTest, ShouldUpdateViewTest);
(...skipping 17 matching lines...) Expand all
262 std::vector<InfolistView*> infolist_views_; 263 std::vector<InfolistView*> infolist_views_;
263 264
264 bool visible_; 265 bool visible_;
265 266
266 base::OneShotTimer<InfolistWindowView> show_hide_timer_; 267 base::OneShotTimer<InfolistWindowView> show_hide_timer_;
267 268
268 static bool ShouldUpdateView( 269 static bool ShouldUpdateView(
269 const mozc::commands::InformationList* old_usages, 270 const mozc::commands::InformationList* old_usages,
270 const mozc::commands::InformationList* new_usages); 271 const mozc::commands::InformationList* new_usages);
271 272
273 // Information title font
274 scoped_ptr<gfx::Font> title_font_;
275 // Information description font
276 scoped_ptr<gfx::Font> description_font_;
277
272 DISALLOW_COPY_AND_ASSIGN(InfolistWindowView); 278 DISALLOW_COPY_AND_ASSIGN(InfolistWindowView);
273 }; 279 };
274 280
275 } // namespace input_method 281 } // namespace input_method
276 } // namespace chromeos 282 } // namespace chromeos
277 283
278 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_ 284 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698