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

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

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 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/uninstall_view.h ('k') | views/controls/combobox/combobox.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) 2009 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/uninstall_view.h" 5 #include "chrome/browser/views/uninstall_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/string16.h"
11 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/shell_integration.h" 12 #include "chrome/browser/shell_integration.h"
11 #include "chrome/common/result_codes.h" 13 #include "chrome/common/result_codes.h"
12 #include "chrome/installer/util/browser_distribution.h" 14 #include "chrome/installer/util/browser_distribution.h"
13 #include "chrome/installer/util/shell_util.h" 15 #include "chrome/installer/util/shell_util.h"
14 #include "views/controls/button/checkbox.h" 16 #include "views/controls/button/checkbox.h"
15 #include "views/controls/label.h" 17 #include "views/controls/label.h"
16 #include "views/standard_layout.h" 18 #include "views/standard_layout.h"
17 19
18 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
19 21
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 137
136 views::View* UninstallView::GetContentsView() { 138 views::View* UninstallView::GetContentsView() {
137 return this; 139 return this;
138 } 140 }
139 141
140 int UninstallView::GetItemCount() { 142 int UninstallView::GetItemCount() {
141 DCHECK(!browsers_->empty()); 143 DCHECK(!browsers_->empty());
142 return browsers_->size(); 144 return browsers_->size();
143 } 145 }
144 146
145 std::wstring UninstallView::GetItemAt(int index) { 147 string16 UninstallView::GetItemAt(int index) {
146 DCHECK(index < (int) browsers_->size()); 148 DCHECK(index < (int) browsers_->size());
147 BrowsersMap::const_iterator it = browsers_->begin(); 149 BrowsersMap::const_iterator it = browsers_->begin();
148 std::advance(it, index); 150 std::advance(it, index);
149 return (*it).first; 151 return WideToUTF16Hack((*it).first);
150 } 152 }
OLDNEW
« no previous file with comments | « chrome/browser/views/uninstall_view.h ('k') | views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698