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

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

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) Created 3 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) 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/template_url_service_factory.h" 8 #include "chrome/browser/search_engines/template_url_service_factory.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 28 matching lines...) Expand all
39 39
40 void FirstRunBubble::Init() { 40 void FirstRunBubble::Init() {
41 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 41 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
42 const gfx::FontList& original_font_list = 42 const gfx::FontList& original_font_list =
43 rb.GetFontList(ui::ResourceBundle::MediumFont); 43 rb.GetFontList(ui::ResourceBundle::MediumFont);
44 44
45 const base::string16 search_engine_name = browser_ ? 45 const base::string16 search_engine_name = browser_ ?
46 GetDefaultSearchEngineName( 46 GetDefaultSearchEngineName(
47 TemplateURLServiceFactory::GetForProfile(browser_->profile())) : 47 TemplateURLServiceFactory::GetForProfile(browser_->profile())) :
48 base::string16(); 48 base::string16();
49
50 // TODO(tapted): Update these when there are mocks. http://crbug.com/699338.
49 views::Label* title = new views::Label( 51 views::Label* title = new views::Label(
50 l10n_util::GetStringFUTF16(IDS_FR_BUBBLE_TITLE, search_engine_name), 52 l10n_util::GetStringFUTF16(IDS_FR_BUBBLE_TITLE, search_engine_name),
51 original_font_list.Derive(2, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)); 53 {original_font_list.Derive(2, gfx::Font::NORMAL,
54 gfx::Font::Weight::BOLD)});
52 55
53 views::Link* change = 56 views::Link* change =
54 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE)); 57 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
55 change->SetFontList(original_font_list); 58 change->SetFontList(original_font_list);
56 change->set_listener(this); 59 change->set_listener(this);
57 60
58 views::Label* subtext = 61 views::Label* subtext = new views::Label(
59 new views::Label(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), 62 l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list});
60 original_font_list);
61 63
62 views::GridLayout* layout = views::GridLayout::CreatePanel(this); 64 views::GridLayout* layout = views::GridLayout::CreatePanel(this);
63 SetLayoutManager(layout); 65 SetLayoutManager(layout);
64 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset); 66 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset);
65 67
66 views::ColumnSet* columns = layout->AddColumnSet(0); 68 views::ColumnSet* columns = layout->AddColumnSet(0);
67 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 69 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
68 views::GridLayout::USE_PREF, 0, 0); 70 views::GridLayout::USE_PREF, 0, 0);
69 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); 71 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
70 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 72 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 136
135 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() { 137 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() {
136 if (!event_monitor_) 138 if (!event_monitor_)
137 return; 139 return;
138 140
139 event_monitor_.reset(); 141 event_monitor_.reset();
140 DCHECK(bubble_); 142 DCHECK(bubble_);
141 bubble_->GetWidget()->Close(); 143 bubble_->GetWidget()->Close();
142 bubble_ = nullptr; 144 bubble_ = nullptr;
143 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698