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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.h

Issue 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac fixes Created 4 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // ui::LinuxInputMethodContextFactory: 56 // ui::LinuxInputMethodContextFactory:
57 scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext( 57 scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
58 ui::LinuxInputMethodContextDelegate* delegate, 58 ui::LinuxInputMethodContextDelegate* delegate,
59 bool is_simple) const override; 59 bool is_simple) const override;
60 60
61 // gfx::LinuxFontDelegate: 61 // gfx::LinuxFontDelegate:
62 gfx::FontRenderParams GetDefaultFontRenderParams() const override; 62 gfx::FontRenderParams GetDefaultFontRenderParams() const override;
63 void GetDefaultFontDescription( 63 void GetDefaultFontDescription(
64 std::string* family_out, 64 std::string* family_out,
65 int* size_pixels_out, 65 int* size_pixels_out,
66 int* style_out, 66 bool* italic_out,
67 gfx::Font::Weight* weight_out,
67 gfx::FontRenderParams* params_out) const override; 68 gfx::FontRenderParams* params_out) const override;
68 69
69 // ui::ShellDialogLinux: 70 // ui::ShellDialogLinux:
70 ui::SelectFileDialog* CreateSelectFileDialog( 71 ui::SelectFileDialog* CreateSelectFileDialog(
71 ui::SelectFileDialog::Listener* listener, 72 ui::SelectFileDialog::Listener* listener,
72 ui::SelectFilePolicy* policy) const override; 73 ui::SelectFilePolicy* policy) const override;
73 74
74 // ui::LinuxUI: 75 // ui::LinuxUI:
75 void Initialize() override; 76 void Initialize() override;
76 gfx::Image GetThemeImageNamed(int id) const override; 77 gfx::Image GetThemeImageNamed(int id) const override;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 SkColor track_color_; 193 SkColor track_color_;
193 SkColor active_selection_bg_color_; 194 SkColor active_selection_bg_color_;
194 SkColor active_selection_fg_color_; 195 SkColor active_selection_fg_color_;
195 SkColor inactive_selection_bg_color_; 196 SkColor inactive_selection_bg_color_;
196 SkColor inactive_selection_fg_color_; 197 SkColor inactive_selection_fg_color_;
197 198
198 // Details about the default UI font. 199 // Details about the default UI font.
199 std::string default_font_family_; 200 std::string default_font_family_;
200 int default_font_size_pixels_; 201 int default_font_size_pixels_;
201 int default_font_style_; // Bitfield of gfx::Font::Style values. 202 int default_font_style_; // Bitfield of gfx::Font::Style values.
203 gfx::Font::Weight default_font_weight_;
202 gfx::FontRenderParams default_font_render_params_; 204 gfx::FontRenderParams default_font_render_params_;
203 205
204 #if defined(USE_GCONF) 206 #if defined(USE_GCONF)
205 // Currently, the only source of window button configuration. This will 207 // Currently, the only source of window button configuration. This will
206 // change if we ever have to support XFCE's configuration system or KDE's. 208 // change if we ever have to support XFCE's configuration system or KDE's.
207 scoped_ptr<GConfListener> gconf_listener_; 209 scoped_ptr<GConfListener> gconf_listener_;
208 #endif // defined(USE_GCONF) 210 #endif // defined(USE_GCONF)
209 211
210 // If either of these vectors are non-empty, they represent the current 212 // If either of these vectors are non-empty, they represent the current
211 // window button configuration. 213 // window button configuration.
(...skipping 25 matching lines...) Expand all
237 } // namespace libgtk2ui 239 } // namespace libgtk2ui
238 240
239 // Access point to the GTK2 desktop system. This should be the only symbol that 241 // Access point to the GTK2 desktop system. This should be the only symbol that
240 // is exported in the library; everything else should be used through the 242 // is exported in the library; everything else should be used through the
241 // interface, because eventually this .so will be loaded through dlopen at 243 // interface, because eventually this .so will be loaded through dlopen at
242 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 244 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
243 // QT or whatever. 245 // QT or whatever.
244 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI(); 246 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
245 247
246 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 248 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698