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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: fix another callsite 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/extensions/extension_install_dialog_view.h" 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 views::Link* store_link = new views::Link( 250 views::Link* store_link = new views::Link(
251 l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK)); 251 l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK));
252 store_link->SetFontList(small_font_list); 252 store_link->SetFontList(small_font_list);
253 store_link->set_listener(this); 253 store_link->set_listener(this);
254 layout->AddView(store_link); 254 layout->AddView(store_link);
255 } 255 }
256 256
257 if (prompt_->ShouldShowPermissions()) { 257 if (prompt_->ShouldShowPermissions()) {
258 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); 258 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
259 layout->StartRow(0, column_set_id); 259 layout->StartRow(0, column_set_id);
260 layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 3, 1, 260 layout->AddView(new views::Separator(), 3, 1, views::GridLayout::FILL,
261 views::GridLayout::FILL, views::GridLayout::FILL); 261 views::GridLayout::FILL);
262 } 262 }
263 263
264 const int content_width = 264 const int content_width =
265 left_column_width + views::kPanelHorizMargin + kIconSize; 265 left_column_width + views::kPanelHorizMargin + kIconSize;
266 266
267 // Create the scrollable view which will contain the permissions and retained 267 // Create the scrollable view which will contain the permissions and retained
268 // files/devices. It will span the full content width. 268 // files/devices. It will span the full content width.
269 CustomScrollableView* scrollable = new CustomScrollableView(); 269 CustomScrollableView* scrollable = new CustomScrollableView();
270 views::GridLayout* scroll_layout = new views::GridLayout(scrollable); 270 views::GridLayout* scroll_layout = new views::GridLayout(scrollable);
271 scrollable->SetLayoutManager(scroll_layout); 271 scrollable->SetLayoutManager(scroll_layout);
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 gfx::ImageSkia icon = gfx::CreateVectorIcon( 731 gfx::ImageSkia icon = gfx::CreateVectorIcon(
732 expanded ? kCaretUpIcon : kCaretDownIcon, gfx::kChromeIconGrey); 732 expanded ? kCaretUpIcon : kCaretDownIcon, gfx::kChromeIconGrey);
733 arrow_toggle_->SetImage(views::Button::STATE_NORMAL, &icon); 733 arrow_toggle_->SetImage(views::Button::STATE_NORMAL, &icon);
734 } 734 }
735 735
736 // static 736 // static
737 ExtensionInstallPrompt::ShowDialogCallback 737 ExtensionInstallPrompt::ShowDialogCallback
738 ExtensionInstallPrompt::GetViewsShowDialogCallback() { 738 ExtensionInstallPrompt::GetViewsShowDialogCallback() {
739 return base::Bind(&ShowExtensionInstallDialogImpl); 739 return base::Bind(&ShowExtensionInstallDialogImpl);
740 } 740 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698