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

Side by Side Diff: chrome/browser/ui/views/options/advanced_contents_view.cc

Issue 6083013: Fix typo; unbreak official Win build.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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/views/options/advanced_contents_view.h" 5 #include "chrome/browser/views/options/advanced_contents_view.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include <cryptuiapi.h> 9 #include <cryptuiapi.h>
10 #pragma comment(lib, "cryptui.lib") 10 #pragma comment(lib, "cryptui.lib")
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 enable_dns_prefetching_checkbox_ = new views::Checkbox( 566 enable_dns_prefetching_checkbox_ = new views::Checkbox(
567 UTF16ToWide(l10n_util::GetStringUTF16( 567 UTF16ToWide(l10n_util::GetStringUTF16(
568 IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION))); 568 IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)));
569 enable_dns_prefetching_checkbox_->set_listener(this); 569 enable_dns_prefetching_checkbox_->set_listener(this);
570 enable_safe_browsing_checkbox_ = new views::Checkbox( 570 enable_safe_browsing_checkbox_ = new views::Checkbox(
571 UTF16ToWide(l10n_util::GetStringUTF16( 571 UTF16ToWide(l10n_util::GetStringUTF16(
572 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION))); 572 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION)));
573 enable_safe_browsing_checkbox_->set_listener(this); 573 enable_safe_browsing_checkbox_->set_listener(this);
574 #if defined(GOOGLE_CHROME_BUILD) 574 #if defined(GOOGLE_CHROME_BUILD)
575 reporting_enabled_checkbox_ = new views::Checkbox( 575 reporting_enabled_checkbox_ = new views::Checkbox(
576 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING)); 576 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING)));
577 reporting_enabled_checkbox_->SetMultiLine(true); 577 reporting_enabled_checkbox_->SetMultiLine(true);
578 reporting_enabled_checkbox_->set_listener(this); 578 reporting_enabled_checkbox_->set_listener(this);
579 reporting_enabled_checkbox_->SetVisible(true); 579 reporting_enabled_checkbox_->SetVisible(true);
580 #endif 580 #endif
581 learn_more_link_ = new views::Link( 581 learn_more_link_ = new views::Link(
582 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE))); 582 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
583 learn_more_link_->SetController(this); 583 learn_more_link_->SetController(this);
584 584
585 GridLayout* layout = new GridLayout(contents_); 585 GridLayout* layout = new GridLayout(contents_);
586 contents_->SetLayoutManager(layout); 586 contents_->SetLayoutManager(layout);
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 // AdvancedScrollViewContainer, views::View overrides: 1636 // AdvancedScrollViewContainer, views::View overrides:
1637 1637
1638 void AdvancedScrollViewContainer::Layout() { 1638 void AdvancedScrollViewContainer::Layout() {
1639 gfx::Rect lb = GetLocalBounds(false); 1639 gfx::Rect lb = GetLocalBounds(false);
1640 1640
1641 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( 1641 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
1642 gfx::NativeTheme::LIST); 1642 gfx::NativeTheme::LIST);
1643 lb.Inset(border.width(), border.height()); 1643 lb.Inset(border.width(), border.height());
1644 scroll_view_->SetBounds(lb); 1644 scroll_view_->SetBounds(lb);
1645 } 1645 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698