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

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

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/wm_overview_title.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 518
519 DISALLOW_COPY_AND_ASSIGN(InternetPageContentView); 519 DISALLOW_COPY_AND_ASSIGN(InternetPageContentView);
520 }; 520 };
521 521
522 //////////////////////////////////////////////////////////////////////////////// 522 ////////////////////////////////////////////////////////////////////////////////
523 // InternetPageContentView, SettingsPageView implementation: 523 // InternetPageContentView, SettingsPageView implementation:
524 524
525 InternetPageContentView::InternetPageContentView(Profile* profile) 525 InternetPageContentView::InternetPageContentView(Profile* profile)
526 : SettingsPageView(profile) { 526 : SettingsPageView(profile) {
527 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 527 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
528 line_height_ = rb.GetFont(ResourceBundle::BaseFont).height(); 528 line_height_ = rb.GetFont(ResourceBundle::BaseFont).GetHeight();
529 } 529 }
530 530
531 void InternetPageContentView::RefreshContents() { 531 void InternetPageContentView::RefreshContents() {
532 wired_section_->RefreshContents(); 532 wired_section_->RefreshContents();
533 wireless_section_->RefreshContents(); 533 wireless_section_->RefreshContents();
534 remembered_section_->RefreshContents(); 534 remembered_section_->RefreshContents();
535 } 535 }
536 536
537 int InternetPageContentView::GetLineScrollIncrement( 537 int InternetPageContentView::GetLineScrollIncrement(
538 views::ScrollView* scroll_view, 538 views::ScrollView* scroll_view,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 scroll_view_->SetBounds(GetLocalBounds(false)); 611 scroll_view_->SetBounds(GetLocalBounds(false));
612 scroll_view_->Layout(); 612 scroll_view_->Layout();
613 } 613 }
614 614
615 void InternetPageView::InitControlLayout() { 615 void InternetPageView::InitControlLayout() {
616 AddChildView(scroll_view_); 616 AddChildView(scroll_view_);
617 scroll_view_->SetContents(contents_view_); 617 scroll_view_->SetContents(contents_view_);
618 } 618 }
619 619
620 } // namespace chromeos 620 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/wm_overview_title.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698