| OLD | NEW |
| 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/browser_dialogs.h" | 10 #include "chrome/browser/ui/browser_dialogs.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 views::Link* change = | 57 views::Link* change = |
| 58 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE)); | 58 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE)); |
| 59 change->SetFontList(original_font_list); | 59 change->SetFontList(original_font_list); |
| 60 change->set_listener(this); | 60 change->set_listener(this); |
| 61 | 61 |
| 62 views::Label* subtext = new views::Label( | 62 views::Label* subtext = new views::Label( |
| 63 l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list}); | 63 l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list}); |
| 64 | 64 |
| 65 views::GridLayout* layout = views::GridLayout::CreatePanel(this); | 65 views::GridLayout* layout = views::GridLayout::CreatePanel(this); |
| 66 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset); | 66 SetBorder(views::CreateEmptyBorder(kTopInset, kLeftInset, kBottomInset, |
| 67 kRightInset)); |
| 67 | 68 |
| 68 ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); | 69 ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
| 69 | 70 |
| 70 views::ColumnSet* columns = layout->AddColumnSet(0); | 71 views::ColumnSet* columns = layout->AddColumnSet(0); |
| 71 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, | 72 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, |
| 72 views::GridLayout::USE_PREF, 0, 0); | 73 views::GridLayout::USE_PREF, 0, 0); |
| 73 columns->AddPaddingColumn(0, provider->GetDistanceMetric( | 74 columns->AddPaddingColumn(0, provider->GetDistanceMetric( |
| 74 views::DISTANCE_RELATED_CONTROL_HORIZONTAL)); | 75 views::DISTANCE_RELATED_CONTROL_HORIZONTAL)); |
| 75 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, | 76 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, |
| 76 views::GridLayout::USE_PREF, 0, 0); | 77 views::GridLayout::USE_PREF, 0, 0); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 142 |
| 142 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() { | 143 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() { |
| 143 if (!event_monitor_) | 144 if (!event_monitor_) |
| 144 return; | 145 return; |
| 145 | 146 |
| 146 event_monitor_.reset(); | 147 event_monitor_.reset(); |
| 147 DCHECK(bubble_); | 148 DCHECK(bubble_); |
| 148 bubble_->GetWidget()->Close(); | 149 bubble_->GetWidget()->Close(); |
| 149 bubble_ = nullptr; | 150 bubble_ = nullptr; |
| 150 } | 151 } |
| OLD | NEW |