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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: revert test change 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
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | ui/views/controls/separator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/website_settings/website_settings_popup_view.h " 5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 1, 432 1,
433 views::GridLayout::USE_PREF, 433 views::GridLayout::USE_PREF,
434 0, 434 0,
435 0); 435 0);
436 436
437 header_ = new PopupHeaderView(this, this, side_margin); 437 header_ = new PopupHeaderView(this, this, side_margin);
438 layout->StartRow(1, content_column); 438 layout->StartRow(1, content_column);
439 layout->AddView(header_); 439 layout->AddView(header_);
440 440
441 layout->StartRow(0, content_column); 441 layout->StartRow(0, content_column);
442 separator_ = new views::Separator(views::Separator::HORIZONTAL); 442 separator_ = new views::Separator();
443 layout->AddView(separator_); 443 layout->AddView(separator_);
444 444
445 layout->AddPaddingRow(1, kHeaderMarginBottom); 445 layout->AddPaddingRow(1, kHeaderMarginBottom);
446 layout->StartRow(1, content_column); 446 layout->StartRow(1, content_column);
447 447
448 site_settings_view_ = CreateSiteSettingsView(side_margin); 448 site_settings_view_ = CreateSiteSettingsView(side_margin);
449 layout->AddView(site_settings_view_); 449 layout->AddView(site_settings_view_);
450 450
451 if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) { 451 if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
452 // In non-material, titles are inset from the dialog margin. Ensure the 452 // In non-material, titles are inset from the dialog margin. Ensure the
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED); 754 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
755 break; 755 break;
756 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS: 756 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
757 presenter_->OnRevokeSSLErrorBypassButtonPressed(); 757 presenter_->OnRevokeSSLErrorBypassButtonPressed();
758 GetWidget()->Close(); 758 GetWidget()->Close();
759 break; 759 break;
760 default: 760 default:
761 NOTREACHED(); 761 NOTREACHED();
762 } 762 }
763 } 763 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | ui/views/controls/separator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698