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

Side by Side Diff: ui/app_list/views/folder_header_view.cc

Issue 253833004: Add vox support for reading unnamed folder description and fix a focus bug when app launcher is ope… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « ui/app_list/views/folder_header_view.h ('k') | no next file » | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/app_list/views/folder_header_view.h" 5 #include "ui/app_list/views/folder_header_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "grit/ui_strings.h" 9 #include "grit/ui_strings.h"
10 #include "ui/app_list/app_list_constants.h" 10 #include "ui/app_list/app_list_constants.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 folder_item_ = NULL; 110 folder_item_ = NULL;
111 } 111 }
112 112
113 void FolderHeaderView::Update() { 113 void FolderHeaderView::Update() {
114 if (!folder_item_) 114 if (!folder_item_)
115 return; 115 return;
116 116
117 folder_name_view_->SetVisible(folder_name_visible_); 117 folder_name_view_->SetVisible(folder_name_visible_);
118 if (folder_name_visible_) { 118 if (folder_name_visible_) {
119 folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->name())); 119 folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->name()));
120 UpdateFolderNameAccessibleName();
120 } 121 }
121 122
122 Layout(); 123 Layout();
123 } 124 }
124 125
126 void FolderHeaderView::UpdateFolderNameAccessibleName() {
127 base::string16 access_name = folder_name_view_->text().empty()
128 ? folder_name_placeholder_text_
129 : base::string16();
xiyuan 2014/04/28 21:43:27 Why use empty string when folder_name_view_->text(
jennyz 2014/04/28 22:23:01 Added a comment to explain.
130 folder_name_view_->SetAccessibleName(access_name);
131 }
132
125 const base::string16& FolderHeaderView::GetFolderNameForTest() { 133 const base::string16& FolderHeaderView::GetFolderNameForTest() {
126 return folder_name_view_->text(); 134 return folder_name_view_->text();
127 } 135 }
128 136
129 void FolderHeaderView::SetFolderNameForTest(const base::string16& name) { 137 void FolderHeaderView::SetFolderNameForTest(const base::string16& name) {
130 folder_name_view_->SetText(name); 138 folder_name_view_->SetText(name);
131 } 139 }
132 140
133 bool FolderHeaderView::IsFolderNameEnabledForTest() const { 141 bool FolderHeaderView::IsFolderNameEnabledForTest() const {
134 return folder_name_view_->enabled(); 142 return folder_name_view_->enabled();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 return; 199 return;
192 200
193 folder_item_->RemoveObserver(this); 201 folder_item_->RemoveObserver(this);
194 // Enforce the maximum folder name length in UI. 202 // Enforce the maximum folder name length in UI.
195 std::string name = base::UTF16ToUTF8( 203 std::string name = base::UTF16ToUTF8(
196 folder_name_view_->text().substr(0, kMaxFolderNameChars)); 204 folder_name_view_->text().substr(0, kMaxFolderNameChars));
197 if (name != folder_item_->name()) 205 if (name != folder_item_->name())
198 delegate_->SetItemName(folder_item_, name); 206 delegate_->SetItemName(folder_item_, name);
199 folder_item_->AddObserver(this); 207 folder_item_->AddObserver(this);
200 208
209 UpdateFolderNameAccessibleName();
210
201 Layout(); 211 Layout();
202 } 212 }
203 213
204 void FolderHeaderView::ButtonPressed(views::Button* sender, 214 void FolderHeaderView::ButtonPressed(views::Button* sender,
205 const ui::Event& event) { 215 const ui::Event& event) {
206 delegate_->NavigateBack(folder_item_, event); 216 delegate_->NavigateBack(folder_item_, event);
207 } 217 }
208 218
209 void FolderHeaderView::ItemIconChanged() { 219 void FolderHeaderView::ItemIconChanged() {
210 } 220 }
211 221
212 void FolderHeaderView::ItemNameChanged() { 222 void FolderHeaderView::ItemNameChanged() {
213 Update(); 223 Update();
214 } 224 }
215 225
216 void FolderHeaderView::ItemHighlightedChanged() { 226 void FolderHeaderView::ItemHighlightedChanged() {
217 } 227 }
218 228
219 void FolderHeaderView::ItemIsInstallingChanged() { 229 void FolderHeaderView::ItemIsInstallingChanged() {
220 } 230 }
221 231
222 void FolderHeaderView::ItemPercentDownloadedChanged() { 232 void FolderHeaderView::ItemPercentDownloadedChanged() {
223 } 233 }
224 234
225 } // namespace app_list 235 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/folder_header_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698