| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 #endif | 649 #endif |
| 650 learn_more_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE)); | 650 learn_more_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE)); |
| 651 learn_more_link_->SetController(this); | 651 learn_more_link_->SetController(this); |
| 652 cookie_behavior_label_ = new views::Label( | 652 cookie_behavior_label_ = new views::Label( |
| 653 l10n_util::GetString(IDS_OPTIONS_COOKIES_ACCEPT_LABEL)); | 653 l10n_util::GetString(IDS_OPTIONS_COOKIES_ACCEPT_LABEL)); |
| 654 allow_cookies_model_.reset(new CookieBehaviorComboModel); | 654 allow_cookies_model_.reset(new CookieBehaviorComboModel); |
| 655 cookie_behavior_combobox_ = new views::Combobox( | 655 cookie_behavior_combobox_ = new views::Combobox( |
| 656 allow_cookies_model_.get()); | 656 allow_cookies_model_.get()); |
| 657 cookie_behavior_combobox_->set_listener(this); | 657 cookie_behavior_combobox_->set_listener(this); |
| 658 show_cookies_button_ = new views::NativeButton( | 658 show_cookies_button_ = new views::NativeButton( |
| 659 this, l10n_util::GetString(IDS_OPTIONS_COOKIES_SHOWCOOKIES)); | 659 this, l10n_util::GetString( |
| 660 IDS_OPTIONS_COOKIES_SHOWCOOKIES_WEBSITE_PERMISSIONS)); |
| 660 | 661 |
| 661 GridLayout* layout = new GridLayout(contents_); | 662 GridLayout* layout = new GridLayout(contents_); |
| 662 contents_->SetLayoutManager(layout); | 663 contents_->SetLayoutManager(layout); |
| 663 | 664 |
| 664 const int single_column_view_set_id = 0; | 665 const int single_column_view_set_id = 0; |
| 665 AddWrappingColumnSet(layout, single_column_view_set_id); | 666 AddWrappingColumnSet(layout, single_column_view_set_id); |
| 666 const int dependent_labeled_field_set_id = 1; | 667 const int dependent_labeled_field_set_id = 1; |
| 667 AddDependentTwoColumnSet(layout, dependent_labeled_field_set_id); | 668 AddDependentTwoColumnSet(layout, dependent_labeled_field_set_id); |
| 668 const int indented_view_set_id = 2; | 669 const int indented_view_set_id = 2; |
| 669 AddIndentedColumnSet(layout, indented_view_set_id); | 670 AddIndentedColumnSet(layout, indented_view_set_id); |
| (...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 | 1400 |
| 1400 void AdvancedScrollViewContainer::Layout() { | 1401 void AdvancedScrollViewContainer::Layout() { |
| 1401 gfx::Rect lb = GetLocalBounds(false); | 1402 gfx::Rect lb = GetLocalBounds(false); |
| 1402 | 1403 |
| 1403 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1404 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
| 1404 gfx::NativeTheme::LIST); | 1405 gfx::NativeTheme::LIST); |
| 1405 lb.Inset(border.width(), border.height()); | 1406 lb.Inset(border.width(), border.height()); |
| 1406 scroll_view_->SetBounds(lb); | 1407 scroll_view_->SetBounds(lb); |
| 1407 scroll_view_->Layout(); | 1408 scroll_view_->Layout(); |
| 1408 } | 1409 } |
| OLD | NEW |