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

Side by Side Diff: chrome/browser/views/options/content_filter_page_view.cc

Issue 2799042: Windows: Replace tabs in content settings with a listbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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 | chrome/browser/views/options/content_settings_window_view.h » ('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/views/options/content_filter_page_view.h" 5 #include "chrome/browser/views/options/content_filter_page_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 8 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/browser/views/options/exceptions_view.h" 10 #include "chrome/browser/views/options/exceptions_view.h"
(...skipping 17 matching lines...) Expand all
28 ContentFilterPageView::~ContentFilterPageView() { 28 ContentFilterPageView::~ContentFilterPageView() {
29 } 29 }
30 30
31 //////////////////////////////////////////////////////////////////////////////// 31 ////////////////////////////////////////////////////////////////////////////////
32 // ContentFilterPageView, OptionsPageView implementation: 32 // ContentFilterPageView, OptionsPageView implementation:
33 33
34 void ContentFilterPageView::InitControlLayout() { 34 void ContentFilterPageView::InitControlLayout() {
35 using views::GridLayout; 35 using views::GridLayout;
36 36
37 GridLayout* layout = new GridLayout(this); 37 GridLayout* layout = new GridLayout(this);
38 layout->SetInsets(5, 5, 5, 5);
39 SetLayoutManager(layout); 38 SetLayoutManager(layout);
40 39
41 const int single_column_set_id = 0; 40 const int single_column_set_id = 0;
42 views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id); 41 views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
43 column_set->AddPaddingColumn(0, kRelatedControlVerticalSpacing); 42 column_set->AddPaddingColumn(0, kRelatedControlVerticalSpacing);
44 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 43 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
45 GridLayout::USE_PREF, 0, 0); 44 GridLayout::USE_PREF, 0, 0);
46 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); 45 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
47 46
48 static const int kTitleIDs[] = { 47 static const int kTitleIDs[] = {
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 CONTENT_SETTING_ALLOW : 171 CONTENT_SETTING_ALLOW :
173 (block_radio_->checked() ? CONTENT_SETTING_BLOCK : CONTENT_SETTING_ASK); 172 (block_radio_->checked() ? CONTENT_SETTING_BLOCK : CONTENT_SETTING_ASK);
174 if (content_type_ == CONTENT_SETTINGS_TYPE_GEOLOCATION) { 173 if (content_type_ == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
175 profile()->GetGeolocationContentSettingsMap()->SetDefaultContentSetting( 174 profile()->GetGeolocationContentSettingsMap()->SetDefaultContentSetting(
176 default_setting); 175 default_setting);
177 } else { 176 } else {
178 profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( 177 profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
179 content_type_, default_setting); 178 content_type_, default_setting);
180 } 179 }
181 } 180 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/options/content_settings_window_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698