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

Side by Side Diff: chrome/browser/views/appcache_info_view.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « chrome/browser/views/about_network_dialog.cc ('k') | chrome/browser/views/bug_report_view.cc » ('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/appcache_info_view.h" 5 #include "chrome/browser/views/appcache_info_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/gfx/color_utils.h" 9 #include "app/gfx/color_utils.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "base/i18n/time_formatting.h" 11 #include "base/i18n/time_formatting.h"
12 #include "base/string_util.h" 12 #include "base/utf_string_conversions.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "views/grid_layout.h" 14 #include "views/grid_layout.h"
15 #include "views/controls/label.h" 15 #include "views/controls/label.h"
16 #include "views/controls/textfield/textfield.h" 16 #include "views/controls/textfield/textfield.h"
17 #include "views/standard_layout.h" 17 #include "views/standard_layout.h"
18 18
19 /////////////////////////////////////////////////////////////////////////////// 19 ///////////////////////////////////////////////////////////////////////////////
20 // AppCacheInfoView, public: 20 // AppCacheInfoView, public:
21 21
22 AppCacheInfoView::AppCacheInfoView() 22 AppCacheInfoView::AppCacheInfoView()
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE); 126 SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE);
127 127
128 // Init them now that they're in the view heirarchy. 128 // Init them now that they're in the view heirarchy.
129 field->SetReadOnly(true); 129 field->SetReadOnly(true);
130 field->RemoveBorder(); 130 field->RemoveBorder();
131 field->SetBackgroundColor(text_area_background); 131 field->SetBackgroundColor(text_area_background);
132 132
133 if (add_padding_row) 133 if (add_padding_row)
134 layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing); 134 layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
135 } 135 }
OLDNEW
« no previous file with comments | « chrome/browser/views/about_network_dialog.cc ('k') | chrome/browser/views/bug_report_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698