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

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: Add a lost comment and modify a render text unittest to not test black because of test env font con… Created 4 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) 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 <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // ui::LinuxInputMethodContextFactory: 56 // ui::LinuxInputMethodContextFactory:
57 std::unique_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext( 57 std::unique_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 // TODO(varkha): This should not be necessary once Material Design is on 77 // TODO(varkha): This should not be necessary once Material Design is on
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 SkColor track_color_; 201 SkColor track_color_;
201 SkColor active_selection_bg_color_; 202 SkColor active_selection_bg_color_;
202 SkColor active_selection_fg_color_; 203 SkColor active_selection_fg_color_;
203 SkColor inactive_selection_bg_color_; 204 SkColor inactive_selection_bg_color_;
204 SkColor inactive_selection_fg_color_; 205 SkColor inactive_selection_fg_color_;
205 206
206 // Details about the default UI font. 207 // Details about the default UI font.
207 std::string default_font_family_; 208 std::string default_font_family_;
208 int default_font_size_pixels_; 209 int default_font_size_pixels_;
209 int default_font_style_; // Bitfield of gfx::Font::Style values. 210 int default_font_style_; // Bitfield of gfx::Font::Style values.
211 gfx::Font::Weight default_font_weight_;
210 gfx::FontRenderParams default_font_render_params_; 212 gfx::FontRenderParams default_font_render_params_;
211 213
212 #if defined(USE_GCONF) 214 #if defined(USE_GCONF)
213 // Currently, the only source of window button configuration. This will 215 // Currently, the only source of window button configuration. This will
214 // change if we ever have to support XFCE's configuration system or KDE's. 216 // change if we ever have to support XFCE's configuration system or KDE's.
215 std::unique_ptr<GConfListener> gconf_listener_; 217 std::unique_ptr<GConfListener> gconf_listener_;
216 #endif // defined(USE_GCONF) 218 #endif // defined(USE_GCONF)
217 219
218 // If either of these vectors are non-empty, they represent the current 220 // If either of these vectors are non-empty, they represent the current
219 // window button configuration. 221 // window button configuration.
(...skipping 25 matching lines...) Expand all
245 } // namespace libgtk2ui 247 } // namespace libgtk2ui
246 248
247 // Access point to the GTK2 desktop system. This should be the only symbol that 249 // Access point to the GTK2 desktop system. This should be the only symbol that
248 // is exported in the library; everything else should be used through the 250 // is exported in the library; everything else should be used through the
249 // interface, because eventually this .so will be loaded through dlopen at 251 // interface, because eventually this .so will be loaded through dlopen at
250 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 252 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
251 // QT or whatever. 253 // QT or whatever.
252 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI(); 254 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
253 255
254 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 256 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/icon_with_badge_image_source.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698