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

Side by Side Diff: chrome/browser/ui/views/cookie_info_view.cc

Issue 9875001: views: Rename Combobox "selected getter/setter" accessors to something more accurate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: combo box -> combobox Created 8 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/views/cookie_info_view.h" 5 #include "chrome/browser/ui/views/cookie_info_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/cookies_tree_model.h" 14 #include "chrome/browser/cookies_tree_model.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "grit/locale_settings.h" 16 #include "grit/locale_settings.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/color_utils.h" 19 #include "ui/gfx/color_utils.h"
20 #include "ui/views/border.h" 20 #include "ui/views/border.h"
21 #include "ui/views/controls/combobox/combobox.h" 21 #include "ui/views/controls/combobox/combobox.h"
22 #include "ui/views/controls/label.h" 22 #include "ui/views/controls/label.h"
23 #include "ui/views/controls/textfield/textfield.h" 23 #include "ui/views/controls/textfield/textfield.h"
24 #include "ui/views/layout/grid_layout.h" 24 #include "ui/views/layout/grid_layout.h"
25 #include "ui/views/layout/layout_constants.h" 25 #include "ui/views/layout/layout_constants.h"
26 26
27 static const int kCookieInfoViewBorderSize = 1; 27 namespace {
28 static const int kCookieInfoViewInsetSize = 3; 28
29 const int kCookieInfoViewBorderSize = 1;
30 const int kCookieInfoViewInsetSize = 3;
31
32 } // namespace
29 33
30 /////////////////////////////////////////////////////////////////////////////// 34 ///////////////////////////////////////////////////////////////////////////////
31 // CookieInfoView, public: 35 // CookieInfoView, public:
32 36
33 CookieInfoView::CookieInfoView(bool editable_expiration_date) 37 CookieInfoView::CookieInfoView(bool editable_expiration_date)
34 : name_label_(NULL), 38 : name_label_(NULL),
35 name_value_field_(NULL), 39 name_value_field_(NULL),
36 content_label_(NULL), 40 content_label_(NULL),
37 content_value_field_(NULL), 41 content_value_field_(NULL),
38 domain_label_(NULL), 42 domain_label_(NULL),
(...skipping 29 matching lines...) Expand all
68 base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) : 72 base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) :
69 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION); 73 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION);
70 74
71 if (editable_expiration_date_) { 75 if (editable_expiration_date_) {
72 expire_combo_values_.clear(); 76 expire_combo_values_.clear();
73 if (cookie.DoesExpire()) 77 if (cookie.DoesExpire())
74 expire_combo_values_.push_back(expire_text); 78 expire_combo_values_.push_back(expire_text);
75 expire_combo_values_.push_back( 79 expire_combo_values_.push_back(
76 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION)); 80 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
77 expires_value_combobox_->ModelChanged(); 81 expires_value_combobox_->ModelChanged();
78 expires_value_combobox_->SetSelectedItem(0); 82 expires_value_combobox_->SetSelectedIndex(0);
79 expires_value_combobox_->SetEnabled(true); 83 expires_value_combobox_->SetEnabled(true);
80 expires_value_combobox_->set_listener(this); 84 expires_value_combobox_->set_listener(this);
81 } else { 85 } else {
82 expires_value_field_->SetText(expire_text); 86 expires_value_field_->SetText(expire_text);
83 } 87 }
84 88
85 send_for_value_field_->SetText(cookie.IsSecure() ? 89 send_for_value_field_->SetText(cookie.IsSecure() ?
86 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_SECURE) : 90 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
87 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_ANY)); 91 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_ANY));
88 EnableCookieDisplay(true); 92 EnableCookieDisplay(true);
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 send_for_value_field_->SetBackgroundColor(text_area_background); 278 send_for_value_field_->SetBackgroundColor(text_area_background);
275 created_value_field_->SetReadOnly(true); 279 created_value_field_->SetReadOnly(true);
276 created_value_field_->RemoveBorder(); 280 created_value_field_->RemoveBorder();
277 created_value_field_->SetBackgroundColor(text_area_background); 281 created_value_field_->SetBackgroundColor(text_area_background);
278 if (expires_value_field_) { 282 if (expires_value_field_) {
279 expires_value_field_->SetReadOnly(true); 283 expires_value_field_->SetReadOnly(true);
280 expires_value_field_->RemoveBorder(); 284 expires_value_field_->RemoveBorder();
281 expires_value_field_->SetBackgroundColor(text_area_background); 285 expires_value_field_->SetBackgroundColor(text_area_background);
282 } 286 }
283 } 287 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc ('k') | chrome/browser/ui/views/uninstall_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698