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

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

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Additional cleanup; sync and rebase. Created 7 years, 1 month 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 | Annotate | Revision Log
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 "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/certificate_viewer.h" 9 #include "chrome/browser/certificate_viewer.h"
10 #include "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 1, 306 1,
307 views::GridLayout::USE_PREF, 307 views::GridLayout::USE_PREF,
308 0, 308 0,
309 0); 309 0);
310 310
311 header_ = new PopupHeaderView(this); 311 header_ = new PopupHeaderView(this);
312 layout->StartRow(1, content_column); 312 layout->StartRow(1, content_column);
313 layout->AddView(header_); 313 layout->AddView(header_);
314 314
315 layout->AddPaddingRow(1, kHeaderMarginBottom); 315 layout->AddPaddingRow(1, kHeaderMarginBottom);
316 tabbed_pane_ = new views::TabbedPane(false); 316 tabbed_pane_ = new views::TabbedPane();
317 layout->StartRow(1, content_column); 317 layout->StartRow(1, content_column);
318 layout->AddView(tabbed_pane_); 318 layout->AddView(tabbed_pane_);
319 // Tabs must be added after the tabbed_pane_ was added to the views 319 // Tabs must be added after the tabbed_pane_ was added to the views
320 // hierachy. Adding the |tabbed_pane_| to the views hierachy triggers the 320 // hierachy. Adding the |tabbed_pane_| to the views hierachy triggers the
321 // initialization of the native tab UI element. If the native tab UI 321 // initialization of the native tab UI element. If the native tab UI
322 // element is not initalized adding a tab will result in a NULL pointer 322 // element is not initalized adding a tab will result in a NULL pointer
323 // exception. 323 // exception.
324 tabbed_pane_->AddTabAtIndex( 324 tabbed_pane_->AddTabAtIndex(
325 TAB_ID_PERMISSIONS, 325 TAB_ID_PERMISSIONS,
326 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS), 326 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS),
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 ShowCertificateViewerByID(web_contents_, parent, cert_id_); 756 ShowCertificateViewerByID(web_contents_, parent, cert_id_);
757 } else if (source == help_center_link_) { 757 } else if (source == help_center_link_) {
758 browser_->OpenURL(content::OpenURLParams( 758 browser_->OpenURL(content::OpenURLParams(
759 GURL(chrome::kPageInfoHelpCenterURL), 759 GURL(chrome::kPageInfoHelpCenterURL),
760 content::Referrer(), 760 content::Referrer(),
761 NEW_FOREGROUND_TAB, 761 NEW_FOREGROUND_TAB,
762 content::PAGE_TRANSITION_LINK, 762 content::PAGE_TRANSITION_LINK,
763 false)); 763 false));
764 } 764 }
765 } 765 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698