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

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

Issue 6192007: Remove wstring from views. Part 3: Switch accessibility strings to string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/clear_data_view.h" 5 #include "chrome/browser/ui/views/clear_data_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_window.h" 10 #include "chrome/browser/browser_window.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 clear_server_data_tab_(NULL), 45 clear_server_data_tab_(NULL),
46 clear_browsing_data_tab_(NULL), 46 clear_browsing_data_tab_(NULL),
47 clearing_data_(false) { 47 clearing_data_(false) {
48 DCHECK(profile); 48 DCHECK(profile);
49 Init(); 49 Init();
50 } 50 }
51 51
52 void ClearDataView::Init() { 52 void ClearDataView::Init() {
53 tabs_ = new views::TabbedPane; 53 tabs_ = new views::TabbedPane;
54 54
55 tabs_->SetAccessibleName( 55 tabs_->SetAccessibleName(l10n_util::GetStringFUTF16(
56 UTF16ToWide(l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE, 56 IDS_OPTIONS_DIALOG_TITLE,
57 l10n_util::GetStringUTF16(IDS_OPTIONS_DIALOG_TITLE)))); 57 l10n_util::GetStringUTF16(IDS_OPTIONS_DIALOG_TITLE)));
58 AddChildView(tabs_); 58 AddChildView(tabs_);
59 59
60 int tab_index = 0; 60 int tab_index = 0;
61 clear_browsing_data_tab_ = new ClearBrowsingDataView2(profile_, this); 61 clear_browsing_data_tab_ = new ClearBrowsingDataView2(profile_, this);
62 tabs_->AddTabAtIndex( 62 tabs_->AddTabAtIndex(
63 tab_index++, 63 tab_index++,
64 UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_CHROME_DATA_TAB_LABEL)), 64 UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_CHROME_DATA_TAB_LABEL)),
65 clear_browsing_data_tab_, false); 65 clear_browsing_data_tab_, false);
66 clear_server_data_tab_ = new ClearServerDataView(profile_, this); 66 clear_server_data_tab_ = new ClearServerDataView(profile_, this);
67 tabs_->AddTabAtIndex( 67 tabs_->AddTabAtIndex(
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TITLE)); 166 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TITLE));
167 } 167 }
168 168
169 views::View* ClearDataView::GetContentsView() { 169 views::View* ClearDataView::GetContentsView() {
170 return this; 170 return this;
171 } 171 }
172 172
173 views::View* ClearDataView::GetInitiallyFocusedView() { 173 views::View* ClearDataView::GetInitiallyFocusedView() {
174 return GetDialogClientView()->cancel_button(); 174 return GetDialogClientView()->cancel_button();
175 } 175 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/clear_browsing_data_view.cc ('k') | chrome/browser/ui/views/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698