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

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

Issue 2644903004: Move around more vector icons. (Closed)
Patch Set: fix comment Created 3 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
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/sad_tab_view.h" 5 #include "chrome/browser/ui/views/sad_tab_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/app/vector_icons/vector_icons.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/color_palette.h" 15 #include "ui/gfx/color_palette.h"
15 #include "ui/gfx/paint_vector_icon.h" 16 #include "ui/gfx/paint_vector_icon.h"
16 #include "ui/gfx/vector_icons_public.h"
17 #include "ui/native_theme/common_theme.h" 17 #include "ui/native_theme/common_theme.h"
18 #include "ui/native_theme/native_theme.h" 18 #include "ui/native_theme/native_theme.h"
19 #include "ui/views/background.h" 19 #include "ui/views/background.h"
20 #include "ui/views/controls/button/md_text_button.h" 20 #include "ui/views/controls/button/md_text_button.h"
21 #include "ui/views/controls/image_view.h" 21 #include "ui/views/controls/image_view.h"
22 #include "ui/views/controls/label.h" 22 #include "ui/views/controls/label.h"
23 #include "ui/views/controls/link.h" 23 #include "ui/views/controls/link.h"
24 #include "ui/views/layout/grid_layout.h" 24 #include "ui/views/layout/grid_layout.h"
25 #include "ui/views/layout/layout_constants.h" 25 #include "ui/views/layout/layout_constants.h"
26 #include "ui/views/widget/widget.h" 26 #include "ui/views/widget/widget.h"
(...skipping 20 matching lines...) Expand all
47 views::ColumnSet* columns = layout->AddColumnSet(column_set_id); 47 views::ColumnSet* columns = layout->AddColumnSet(column_set_id);
48 columns->AddPaddingColumn(1, views::kPanelSubVerticalSpacing); 48 columns->AddPaddingColumn(1, views::kPanelSubVerticalSpacing);
49 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 49 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
50 views::GridLayout::USE_PREF, 0, kMinColumnWidth); 50 views::GridLayout::USE_PREF, 0, kMinColumnWidth);
51 columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING, 0, 51 columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING, 0,
52 views::GridLayout::USE_PREF, 0, kMinColumnWidth); 52 views::GridLayout::USE_PREF, 0, kMinColumnWidth);
53 columns->AddPaddingColumn(1, views::kPanelSubVerticalSpacing); 53 columns->AddPaddingColumn(1, views::kPanelSubVerticalSpacing);
54 54
55 views::ImageView* image = new views::ImageView(); 55 views::ImageView* image = new views::ImageView();
56 56
57 image->SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::CRASHED_TAB, 48, 57 image->SetImage(
58 gfx::kChromeIconGrey)); 58 gfx::CreateVectorIcon(kCrashedTabIcon, 48, gfx::kChromeIconGrey));
59 layout->AddPaddingRow(1, views::kPanelVerticalSpacing); 59 layout->AddPaddingRow(1, views::kPanelVerticalSpacing);
60 layout->StartRow(0, column_set_id); 60 layout->StartRow(0, column_set_id);
61 layout->AddView(image, 2, 1); 61 layout->AddView(image, 2, 1);
62 62
63 title_ = CreateLabel(l10n_util::GetStringUTF16(GetTitle())); 63 title_ = CreateLabel(l10n_util::GetStringUTF16(GetTitle()));
64 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 64 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
65 title_->SetFontList(rb.GetFontList(ui::ResourceBundle::LargeFont)); 65 title_->SetFontList(rb.GetFontList(ui::ResourceBundle::LargeFont));
66 title_->SetMultiLine(true); 66 title_->SetMultiLine(true);
67 title_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 67 title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
68 layout->StartRowWithPadding(0, column_set_id, 0, 68 layout->StartRowWithPadding(0, column_set_id, 0,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 namespace chrome { 167 namespace chrome {
168 168
169 SadTab* SadTab::Create(content::WebContents* web_contents, 169 SadTab* SadTab::Create(content::WebContents* web_contents,
170 SadTabKind kind) { 170 SadTabKind kind) {
171 return new SadTabView(web_contents, kind); 171 return new SadTabView(web_contents, kind);
172 } 172 }
173 173
174 } // namespace chrome 174 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698