Merge 43966 - Register the cookie info view as listener to the expiry date co...

chrome/browser/views/cookie_info_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 59 matching lines @@
 
   if (editable_expiration_date_) {
     expire_combo_values_.clear();
     if (cookie.DoesExpire())
       expire_combo_values_.push_back(expire_text);
     expire_combo_values_.push_back(
       l10n_util::GetString(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
     expires_value_combobox_->ModelChanged();
     expires_value_combobox_->SetSelectedItem(0);
     expires_value_combobox_->SetEnabled(true);
+    expires_value_combobox_->set_listener(this);
   } else {
     expires_value_field_->SetText(expire_text);
   }
 
   send_for_value_field_->SetText(cookie.IsSecure() ?
       l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
       l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_ANY));
   EnableCookieDisplay(true);
   Layout();
 }
@@ skipping 176 matching lines @@
   created_value_field_->SetReadOnly(true);
   created_value_field_->RemoveBorder();
   created_value_field_->SetBackgroundColor(text_area_background);
   if (expires_value_field_) {
     expires_value_field_->SetReadOnly(true);
     expires_value_field_->RemoveBorder();
     expires_value_field_->SetBackgroundColor(text_area_background);
   }
 }