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

Side by Side Diff: chrome/browser/ui/views/first_run_bubble.cc

Issue 152343006: 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 unified diff | Download patch | Annotate | Revision Log
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 #include "chrome/browser/ui/views/first_run_bubble.h" 5 #include "chrome/browser/ui/views/first_run_bubble.h"
6 6
7 #include "chrome/browser/first_run/first_run.h" 7 #include "chrome/browser/first_run/first_run.h"
8 #include "chrome/browser/search_engines/util.h" 8 #include "chrome/browser/search_engines/util.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/chrome_pages.h" 10 #include "chrome/browser/ui/chrome_pages.h"
(...skipping 23 matching lines...) Expand all
34 views::BubbleDelegateView::CreateBubble(delegate); 34 views::BubbleDelegateView::CreateBubble(delegate);
35 delegate->StartFade(true); 35 delegate->StartFade(true);
36 return delegate; 36 return delegate;
37 } 37 }
38 38
39 void FirstRunBubble::Init() { 39 void FirstRunBubble::Init() {
40 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 40 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
41 const gfx::FontList& original_font_list = 41 const gfx::FontList& original_font_list =
42 rb.GetFontList(ui::ResourceBundle::MediumFont); 42 rb.GetFontList(ui::ResourceBundle::MediumFont);
43 43
44 views::Label* title = new views::Label(l10n_util::GetStringFUTF16( 44 views::Label* title = new views::Label(
45 IDS_FR_BUBBLE_TITLE, browser_ ? 45 l10n_util::GetStringFUTF16(
46 GetDefaultSearchEngineName(browser_->profile()) : base::string16())); 46 IDS_FR_BUBBLE_TITLE,
47 title->SetFontList(original_font_list.DeriveFontListWithSizeDeltaAndStyle( 47 browser_ ? GetDefaultSearchEngineName(browser_->profile())
48 2, gfx::Font::BOLD)); 48 : base::string16()),
49 original_font_list.Derive(2, gfx::Font::BOLD));
49 50
50 views::Link* change = 51 views::Link* change =
51 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE)); 52 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
52 change->SetFontList(original_font_list); 53 change->SetFontList(original_font_list);
53 change->set_listener(this); 54 change->set_listener(this);
54 55
55 views::Label* subtext = 56 views::Label* subtext =
56 new views::Label(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT)); 57 new views::Label(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT),
57 subtext->SetFontList(original_font_list); 58 original_font_list);
58 59
59 views::GridLayout* layout = views::GridLayout::CreatePanel(this); 60 views::GridLayout* layout = views::GridLayout::CreatePanel(this);
60 SetLayoutManager(layout); 61 SetLayoutManager(layout);
61 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset); 62 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset);
62 63
63 views::ColumnSet* columns = layout->AddColumnSet(0); 64 views::ColumnSet* columns = layout->AddColumnSet(0);
64 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 65 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
65 views::GridLayout::USE_PREF, 0, 0); 66 views::GridLayout::USE_PREF, 0, 0);
66 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); 67 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
67 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 68 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
(...skipping 19 matching lines...) Expand all
87 FirstRunBubble::~FirstRunBubble() { 88 FirstRunBubble::~FirstRunBubble() {
88 } 89 }
89 90
90 void FirstRunBubble::LinkClicked(views::Link* source, int event_flags) { 91 void FirstRunBubble::LinkClicked(views::Link* source, int event_flags) {
91 first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_CHANGE_INVOKED); 92 first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_CHANGE_INVOKED);
92 93
93 GetWidget()->Close(); 94 GetWidget()->Close();
94 if (browser_) 95 if (browser_)
95 chrome::ShowSearchEngineSettings(browser_); 96 chrome::ShowSearchEngineSettings(browser_);
96 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698