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

Side by Side Diff: chrome/browser/chromeos/options/internet_page_view.cc

Issue 6384002: views: Make CreatePanelGridLayout a static method of GridLayout class. (Closed)
Patch Set: fix trybots Created 9 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/options/internet_page_view.h" 5 #include "chrome/browser/chromeos/options/internet_page_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 SetBounds(0, 0, GetParent()->width(), GetPreferredSize().height()); 527 SetBounds(0, 0, GetParent()->width(), GetPreferredSize().height());
528 View::Layout(); 528 View::Layout();
529 } 529 }
530 530
531 void InternetPageContentView::DidChangeBounds(const gfx::Rect& previous, 531 void InternetPageContentView::DidChangeBounds(const gfx::Rect& previous,
532 const gfx::Rect& current) { 532 const gfx::Rect& current) {
533 // Override to do nothing. Calling Layout() interferes with our scrolling. 533 // Override to do nothing. Calling Layout() interferes with our scrolling.
534 } 534 }
535 535
536 void InternetPageContentView::InitControlLayout() { 536 void InternetPageContentView::InitControlLayout() {
537 GridLayout* layout = CreatePanelGridLayout(this); 537 GridLayout* layout = GridLayout::CreatePanel(this);
538 SetLayoutManager(layout); 538 SetLayoutManager(layout);
539 539
540 int single_column_view_set_id = 0; 540 int single_column_view_set_id = 0;
541 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); 541 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
542 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 542 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
543 GridLayout::USE_PREF, 0, 0); 543 GridLayout::USE_PREF, 0, 0);
544 544
545 layout->StartRow(0, single_column_view_set_id); 545 layout->StartRow(0, single_column_view_set_id);
546 wired_section_ = new WiredSection(this, profile()); 546 wired_section_ = new WiredSection(this, profile());
547 layout->AddView(wired_section_); 547 layout->AddView(wired_section_);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 scroll_view_->SetBounds(GetLocalBounds(false)); 587 scroll_view_->SetBounds(GetLocalBounds(false));
588 scroll_view_->Layout(); 588 scroll_view_->Layout();
589 } 589 }
590 590
591 void InternetPageView::InitControlLayout() { 591 void InternetPageView::InitControlLayout() {
592 AddChildView(scroll_view_); 592 AddChildView(scroll_view_);
593 scroll_view_->SetContents(contents_view_); 593 scroll_view_->SetContents(contents_view_);
594 } 594 }
595 595
596 } // namespace chromeos 596 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/options/system_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698