chrome/browser/chromeos/login/language_switch_menu.cc - Issue 7977025: aura: Make 'ui' buildable without gtk.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/language_switch_menu.cc

Issue 7977025: aura: Make 'ui' buildable without gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 3 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:

Index: chrome/browser/chromeos/login/language_switch_menu.cc

diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc

index 3052d96148b6e7b6299cc7bdcff068ab728b9b90..bc60548bc78044f188b4f0f6f5496641cd4913b2 100644

--- a/chrome/browser/chromeos/login/language_switch_menu.cc

+++ b/chrome/browser/chromeos/login/language_switch_menu.cc

@@ -21,7 +21,7 @@

#include "grit/platform_locale_settings.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

-#include "ui/gfx/platform_font_gtk.h"

+#include "ui/gfx/platform_font_pango.h"

#include "views/controls/button/menu_button.h"

#include "views/controls/menu/menu_item_view.h"

#include "views/controls/menu/menu_runner.h"

@@ -139,7 +139,7 @@ void LanguageSwitchMenu::LoadFontsForCurrentLocale() {

gtk_rc_parse("/etc/gtk-2.0/gtkrc");

// Switch the font.

- gfx::PlatformFontGtk::ReloadDefaultFont();

+ gfx::PlatformFontPango::ReloadDefaultFont();

ResourceBundle::GetSharedInstance().ReloadFonts();

}

« no previous file with comments | « build/linux/system.gyp ('k') | chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc » ('j') | no next file with comments »