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

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

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/indexed_db_info_view.h" 5 #include "chrome/browser/ui/views/indexed_db_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/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 /////////////////////////////////////////////////////////////////////////////// 69 ///////////////////////////////////////////////////////////////////////////////
70 // IndexedDBInfoView, private: 70 // IndexedDBInfoView, private:
71 71
72 void IndexedDBInfoView::Init() { 72 void IndexedDBInfoView::Init() {
73 SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW); 73 SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW);
74 views::Border* border = views::Border::CreateSolidBorder( 74 views::Border* border = views::Border::CreateSolidBorder(
75 kIndexedDBInfoViewBorderSize, border_color); 75 kIndexedDBInfoViewBorderSize, border_color);
76 set_border(border); 76 set_border(border);
77 77
78 views::Label* origin_label = new views::Label( 78 views::Label* origin_label = new views::Label(UTF16ToWide(
79 l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL)); 79 l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL)));
80 origin_value_field_ = new views::Textfield; 80 origin_value_field_ = new views::Textfield;
81 views::Label* size_label = new views::Label( 81 views::Label* size_label = new views::Label(UTF16ToWide(
82 l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL)); 82 l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL)));
83 size_value_field_ = new views::Textfield; 83 size_value_field_ = new views::Textfield;
84 views::Label* last_modified_label = new views::Label( 84 views::Label* last_modified_label = new views::Label(UTF16ToWide(
85 l10n_util::GetStringUTF16( 85 l10n_util::GetStringUTF16(
86 IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL)); 86 IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL)));
87 last_modified_value_field_ = new views::Textfield; 87 last_modified_value_field_ = new views::Textfield;
88 88
89 using views::GridLayout; 89 using views::GridLayout;
90 90
91 GridLayout* layout = new GridLayout(this); 91 GridLayout* layout = new GridLayout(this);
92 layout->SetInsets(kIndexedDBInfoViewInsetSize, 92 layout->SetInsets(kIndexedDBInfoViewInsetSize,
93 kIndexedDBInfoViewInsetSize, 93 kIndexedDBInfoViewInsetSize,
94 kIndexedDBInfoViewInsetSize, 94 kIndexedDBInfoViewInsetSize,
95 kIndexedDBInfoViewInsetSize); 95 kIndexedDBInfoViewInsetSize);
96 SetLayoutManager(layout); 96 SetLayoutManager(layout);
(...skipping 24 matching lines...) Expand all
121 origin_value_field_->SetReadOnly(true); 121 origin_value_field_->SetReadOnly(true);
122 origin_value_field_->RemoveBorder(); 122 origin_value_field_->RemoveBorder();
123 origin_value_field_->SetBackgroundColor(text_area_background); 123 origin_value_field_->SetBackgroundColor(text_area_background);
124 size_value_field_->SetReadOnly(true); 124 size_value_field_->SetReadOnly(true);
125 size_value_field_->RemoveBorder(); 125 size_value_field_->RemoveBorder();
126 size_value_field_->SetBackgroundColor(text_area_background); 126 size_value_field_->SetBackgroundColor(text_area_background);
127 last_modified_value_field_->SetReadOnly(true); 127 last_modified_value_field_->SetReadOnly(true);
128 last_modified_value_field_->RemoveBorder(); 128 last_modified_value_field_->RemoveBorder();
129 last_modified_value_field_->SetBackgroundColor(text_area_background); 129 last_modified_value_field_->SetBackgroundColor(text_area_background);
130 } 130 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/importer/import_progress_dialog_view.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698