Index: chrome/browser/ui/views/cookie_info_view.cc |
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc |
index 67ba0a94a5eb3227ef89028d91afa6b0c141542f..db8fcd0347373779e37aaab9daea32dbf316114d 100644 |
--- a/chrome/browser/ui/views/cookie_info_view.cc |
+++ b/chrome/browser/ui/views/cookie_info_view.cc |
@@ -12,6 +12,8 @@ |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/browsing_data/cookies_tree_model.h" |
+#include "chrome/browser/ui/constrained_window_constants.h" |
+#include "chrome/common/chrome_switches.h" |
#include "grit/generated_resources.h" |
#include "grit/locale_settings.h" |
#include "net/cookies/canonical_cookie.h" |
@@ -185,9 +187,9 @@ void CookieInfoView::Init() { |
#else |
SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW); |
#endif |
- views::Border* border = views::Border::CreateSolidBorder( |
- kCookieInfoViewBorderSize, border_color); |
- set_border(border); |
+ if (!chrome::UseChromeStyleDialogs()) |
+ set_border(views::Border::CreateSolidBorder(kCookieInfoViewBorderSize, |
+ border_color)); |
name_label_ = new views::Label( |
l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NAME_LABEL)); |
@@ -218,10 +220,16 @@ void CookieInfoView::Init() { |
using views::ColumnSet; |
GridLayout* layout = new GridLayout(this); |
- layout->SetInsets(kCookieInfoViewInsetSize, |
- kCookieInfoViewInsetSize, |
- kCookieInfoViewInsetSize, |
- kCookieInfoViewInsetSize); |
+ if (chrome::UseChromeStyleDialogs()) |
+ layout->SetInsets(0, |
+ ConstrainedWindowConstants::kHorizontalPadding, |
+ 0, |
+ ConstrainedWindowConstants::kHorizontalPadding); |
+ else |
+ layout->SetInsets(kCookieInfoViewInsetSize, |
+ kCookieInfoViewInsetSize, |
+ kCookieInfoViewInsetSize, |
+ kCookieInfoViewInsetSize); |
SetLayoutManager(layout); |
int three_column_layout_id = 0; |
@@ -257,30 +265,47 @@ void CookieInfoView::Init() { |
#if defined(USE_AURA) || !defined(OS_WIN) |
SkColor text_area_background = SK_ColorWHITE; |
#else |
- SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE); |
+ SkColor text_area_background = chrome::UseChromeStyleDialogs() ? |
+ SK_ColorWHITE : |
+ color_utils::GetSysSkColor(COLOR_3DFACE); |
#endif |
+ const SkColor kChromeStyleTextColor = SkColorSetRGB(0x78, 0x78, 0x78); |
// Now that the Textfields are in the view hierarchy, we can initialize them. |
name_value_field_->SetReadOnly(true); |
name_value_field_->RemoveBorder(); |
name_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ name_value_field_->SetTextColor(kChromeStyleTextColor); |
content_value_field_->SetReadOnly(true); |
content_value_field_->RemoveBorder(); |
content_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ content_value_field_->SetTextColor(kChromeStyleTextColor); |
domain_value_field_->SetReadOnly(true); |
domain_value_field_->RemoveBorder(); |
domain_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ domain_value_field_->SetTextColor(kChromeStyleTextColor); |
path_value_field_->SetReadOnly(true); |
path_value_field_->RemoveBorder(); |
path_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ path_value_field_->SetTextColor(kChromeStyleTextColor); |
send_for_value_field_->SetReadOnly(true); |
send_for_value_field_->RemoveBorder(); |
send_for_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ send_for_value_field_->SetTextColor(kChromeStyleTextColor); |
created_value_field_->SetReadOnly(true); |
created_value_field_->RemoveBorder(); |
created_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ created_value_field_->SetTextColor(kChromeStyleTextColor); |
if (expires_value_field_) { |
expires_value_field_->SetReadOnly(true); |
expires_value_field_->RemoveBorder(); |
expires_value_field_->SetBackgroundColor(text_area_background); |
+ if (chrome::UseChromeStyleDialogs()) |
+ expires_value_field_->SetTextColor(kChromeStyleTextColor); |
} |
} |