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

Side by Side Diff: ash/system/tray_accessibility.cc

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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 | « ash/system/tray_accessibility.h ('k') | ash/test/test_session_controller_client.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/tray_accessibility.h" 5 #include "ash/system/tray_accessibility.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/accessibility_types.h" 8 #include "ash/accessibility_types.h"
9 #include "ash/resources/vector_icons/vector_icons.h" 9 #include "ash/resources/vector_icons/vector_icons.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 196 }
197 views::Label* label = new views::Label(text); 197 views::Label* label = new views::Label(text);
198 label->SetMultiLine(true); 198 label->SetMultiLine(true);
199 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 199 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
200 return label; 200 return label;
201 } 201 }
202 202
203 //////////////////////////////////////////////////////////////////////////////// 203 ////////////////////////////////////////////////////////////////////////////////
204 // ash::tray::AccessibilityDetailedView 204 // ash::tray::AccessibilityDetailedView
205 205
206 AccessibilityDetailedView::AccessibilityDetailedView(SystemTrayItem* owner, 206 AccessibilityDetailedView::AccessibilityDetailedView(SystemTrayItem* owner)
207 LoginStatus login) 207 : TrayDetailsView(owner) {
208 : TrayDetailsView(owner),
209 login_(login) {
210 Reset(); 208 Reset();
211 AppendAccessibilityList(); 209 AppendAccessibilityList();
212 CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE); 210 CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
213 Layout(); 211 Layout();
214 } 212 }
215 213
216 void AccessibilityDetailedView::AppendAccessibilityList() { 214 void AccessibilityDetailedView::AppendAccessibilityList() {
217 CreateScrollableList(); 215 CreateScrollableList();
218 216
219 AccessibilityDelegate* delegate = Shell::Get()->accessibility_delegate(); 217 AccessibilityDelegate* delegate = Shell::Get()->accessibility_delegate();
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 else if (sender == settings_view_) 406 else if (sender == settings_view_)
409 ShowSettings(); 407 ShowSettings();
410 } 408 }
411 409
412 void AccessibilityDetailedView::CreateExtraTitleRowButtons() { 410 void AccessibilityDetailedView::CreateExtraTitleRowButtons() {
413 DCHECK(!help_view_); 411 DCHECK(!help_view_);
414 DCHECK(!settings_view_); 412 DCHECK(!settings_view_);
415 413
416 tri_view()->SetContainerVisible(TriView::Container::END, true); 414 tri_view()->SetContainerVisible(TriView::Container::END, true);
417 415
418 help_view_ = CreateHelpButton(login_); 416 help_view_ = CreateHelpButton();
419 settings_view_ = 417 settings_view_ =
420 CreateSettingsButton(login_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SETTINGS); 418 CreateSettingsButton(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SETTINGS);
421 tri_view()->AddView(TriView::Container::END, help_view_); 419 tri_view()->AddView(TriView::Container::END, help_view_);
422 tri_view()->AddView(TriView::Container::END, settings_view_); 420 tri_view()->AddView(TriView::Container::END, settings_view_);
423 } 421 }
424 422
425 void AccessibilityDetailedView::ShowSettings() { 423 void AccessibilityDetailedView::ShowSettings() {
426 if (TrayPopupUtils::CanOpenWebUISettings(login_)) { 424 if (TrayPopupUtils::CanOpenWebUISettings()) {
427 Shell::Get()->system_tray_controller()->ShowAccessibilitySettings(); 425 Shell::Get()->system_tray_controller()->ShowAccessibilitySettings();
428 owner()->system_tray()->CloseSystemBubble(); 426 owner()->system_tray()->CloseSystemBubble();
429 } 427 }
430 } 428 }
431 429
432 void AccessibilityDetailedView::ShowHelp() { 430 void AccessibilityDetailedView::ShowHelp() {
433 if (TrayPopupUtils::CanOpenWebUISettings(login_)) { 431 if (TrayPopupUtils::CanOpenWebUISettings()) {
434 Shell::Get()->system_tray_controller()->ShowAccessibilityHelp(); 432 Shell::Get()->system_tray_controller()->ShowAccessibilityHelp();
435 owner()->system_tray()->CloseSystemBubble(); 433 owner()->system_tray()->CloseSystemBubble();
436 } 434 }
437 } 435 }
438 436
439 } // namespace tray 437 } // namespace tray
440 438
441 //////////////////////////////////////////////////////////////////////////////// 439 ////////////////////////////////////////////////////////////////////////////////
442 // ash::TrayAccessibility 440 // ash::TrayAccessibility
443 441
(...skipping 17 matching lines...) Expand all
461 Shell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this); 459 Shell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
462 } 460 }
463 461
464 void TrayAccessibility::SetTrayIconVisible(bool visible) { 462 void TrayAccessibility::SetTrayIconVisible(bool visible) {
465 if (tray_view()) 463 if (tray_view())
466 tray_view()->SetVisible(visible); 464 tray_view()->SetVisible(visible);
467 tray_icon_visible_ = visible; 465 tray_icon_visible_ = visible;
468 } 466 }
469 467
470 tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() { 468 tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() {
471 return new tray::AccessibilityDetailedView(this, login_); 469 return new tray::AccessibilityDetailedView(this);
472 } 470 }
473 471
474 bool TrayAccessibility::GetInitialVisibility() { 472 bool TrayAccessibility::GetInitialVisibility() {
475 // Shows accessibility icon if any accessibility feature is enabled. 473 // Shows accessibility icon if any accessibility feature is enabled.
476 // Otherwise, doen't show it. 474 // Otherwise, doen't show it.
477 return GetAccessibilityState() != A11Y_NONE; 475 return GetAccessibilityState() != A11Y_NONE;
478 } 476 }
479 477
480 views::View* TrayAccessibility::CreateDefaultView(LoginStatus status) { 478 views::View* TrayAccessibility::CreateDefaultView(LoginStatus status) {
481 CHECK(default_ == NULL); 479 CHECK(default_ == NULL);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 if (detailed_popup_) 557 if (detailed_popup_)
560 detailed_popup_->GetWidget()->Close(); 558 detailed_popup_->GetWidget()->Close();
561 if (detailed_menu_) 559 if (detailed_menu_)
562 detailed_menu_->GetWidget()->Close(); 560 detailed_menu_->GetWidget()->Close();
563 } 561 }
564 562
565 previous_accessibility_state_ = accessibility_state; 563 previous_accessibility_state_ = accessibility_state;
566 } 564 }
567 565
568 } // namespace ash 566 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | ash/test/test_session_controller_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698