| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/shelf_item_dialog.h" | 5 #include "chrome/browser/views/shelf_item_dialog.h" |
| 6 | 6 |
| 7 #include "app/gfx/text_elider.h" | 7 #include "app/gfx/text_elider.h" |
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 10 #include "base/gfx/png_decoder.h" | 10 #include "base/gfx/png_decoder.h" |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 url_field_->SetController(this); | 323 url_field_->SetController(this); |
| 324 layout->AddView(url_field_); | 324 layout->AddView(url_field_); |
| 325 | 325 |
| 326 layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing); | 326 layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing); |
| 327 | 327 |
| 328 layout->StartRow(0, single_column_view_set_id); | 328 layout->StartRow(0, single_column_view_set_id); |
| 329 views::Label* description_label = new views::Label(); | 329 views::Label* description_label = new views::Label(); |
| 330 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 330 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 331 description_label->SetText(l10n_util::GetString(IDS_ASI_DESCRIPTION)); | 331 description_label->SetText(l10n_util::GetString(IDS_ASI_DESCRIPTION)); |
| 332 description_label->SetFont( | 332 description_label->SetFont( |
| 333 description_label->GetFont().DeriveFont(0, ChromeFont::BOLD)); | 333 description_label->GetFont().DeriveFont(0, gfx::Font::BOLD)); |
| 334 layout->AddView(description_label); | 334 layout->AddView(description_label); |
| 335 | 335 |
| 336 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 336 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 337 | 337 |
| 338 layout->StartRow(1, single_column_view_set_id); | 338 layout->StartRow(1, single_column_view_set_id); |
| 339 layout->AddView(url_table_); | 339 layout->AddView(url_table_); |
| 340 | 340 |
| 341 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 341 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 342 | 342 |
| 343 AddAccelerator(views::Accelerator(VK_ESCAPE, false, false, false)); | 343 AddAccelerator(views::Accelerator(VK_ESCAPE, false, false, false)); |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 OnSelectionChanged(); | 508 OnSelectionChanged(); |
| 509 PerformModelChange(); | 509 PerformModelChange(); |
| 510 if (window()) | 510 if (window()) |
| 511 window()->Close(); | 511 window()->Close(); |
| 512 } | 512 } |
| 513 } | 513 } |
| 514 | 514 |
| 515 GURL ShelfItemDialog::GetInputURL() const { | 515 GURL ShelfItemDialog::GetInputURL() const { |
| 516 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L"")); | 516 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L"")); |
| 517 } | 517 } |
| OLD | NEW |