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

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

Issue 11421164: Migrate CollectedCookiesViews to Chrome style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/certificate_viewer.h" 9 #include "chrome/browser/certificate_viewer.h"
10 #include "chrome/browser/infobars/infobar_tab_helper.h" 10 #include "chrome/browser/infobars/infobar_tab_helper.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 1, 304 1,
305 views::GridLayout::USE_PREF, 305 views::GridLayout::USE_PREF,
306 0, 306 0,
307 0); 307 0);
308 308
309 header_ = new PopupHeaderView(this); 309 header_ = new PopupHeaderView(this);
310 layout->StartRow(1, content_column); 310 layout->StartRow(1, content_column);
311 layout->AddView(header_); 311 layout->AddView(header_);
312 312
313 layout->AddPaddingRow(1, kHeaderMarginBottom); 313 layout->AddPaddingRow(1, kHeaderMarginBottom);
314 tabbed_pane_ = new views::TabbedPane(); 314 tabbed_pane_ = new views::TabbedPane(false);
315 layout->StartRow(1, content_column); 315 layout->StartRow(1, content_column);
316 layout->AddView(tabbed_pane_); 316 layout->AddView(tabbed_pane_);
317 // Tabs must be added after the tabbed_pane_ was added to the views 317 // Tabs must be added after the tabbed_pane_ was added to the views
318 // hierachy. Adding the |tabbed_pane_| to the views hierachy triggers the 318 // hierachy. Adding the |tabbed_pane_| to the views hierachy triggers the
319 // initialization of the native tab UI element. If the native tab UI 319 // initialization of the native tab UI element. If the native tab UI
320 // element is not initalized adding a tab will result in a NULL pointer 320 // element is not initalized adding a tab will result in a NULL pointer
321 // exception. 321 // exception.
322 tabbed_pane_->AddTabAtIndex( 322 tabbed_pane_->AddTabAtIndex(
323 TAB_ID_PERMISSIONS, 323 TAB_ID_PERMISSIONS,
324 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS), 324 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS),
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 745
746 if (link) { 746 if (link) {
747 content_layout->StartRow(1, 0); 747 content_layout->StartRow(1, 0);
748 content_layout->AddView(link); 748 content_layout->AddView(link);
749 } 749 }
750 750
751 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, 751 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
752 views::GridLayout::LEADING); 752 views::GridLayout::LEADING);
753 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); 753 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
754 } 754 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | ui/views/controls/tabbed_pane/native_tabbed_pane_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698