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

Unified Diff: ash/system/logout_button/logout_button_tray.cc

Issue 140693017: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/date/date_view.cc ('k') | ash/system/monitor/tray_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/logout_button/logout_button_tray.cc
diff --git a/ash/system/logout_button/logout_button_tray.cc b/ash/system/logout_button/logout_button_tray.cc
index 2e55fcbc5f77531ebff0da3a9e73311563803bf4..e7f39433748fd7e7b3924ca4d72ed08aa9029e27 100644
--- a/ash/system/logout_button/logout_button_tray.cc
+++ b/ash/system/logout_button/logout_button_tray.cc
@@ -15,9 +15,8 @@
#include "grit/ash_resources.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/events/event.h"
-#include "ui/gfx/font_list.h"
-#include "ui/gfx/insets.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/views/bubble/tray_bubble_view.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/button/label_button_border.h"
@@ -83,8 +82,6 @@ class LogoutConfirmationDialogDelegate
LogoutButton::LogoutButton(views::ButtonListener* listener)
: views::LabelButton(listener, base::string16()) {
SetupLabelForTray(label());
- SetFontList(
- GetFontList().DeriveFontListWithSizeDeltaAndStyle(0, gfx::Font::NORMAL));
for (size_t state = 0; state < views::Button::STATE_COUNT; ++state)
SetTextColor(static_cast<views::Button::ButtonState>(state), SK_ColorWHITE);
« no previous file with comments | « ash/system/date/date_view.cc ('k') | ash/system/monitor/tray_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698