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

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 2682393004: Remove non-MD test coverage from tests in chrome/browser/chromeos/ (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/shutdown_policy_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 64fb0d3bde27100ea08a143a61911b9a5bc7b8bc..8b8565826626573d27a494e6bb4ed7a4640fec47 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -4,7 +4,6 @@
#include "ash/common/accessibility_types.h"
#include "ash/common/login_status.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray_accessibility.h"
#include "ash/common/test/test_session_state_delegate.h"
@@ -240,23 +239,17 @@ class TrayAccessibilityTest
}
// In material design we show the help button but theme it as disabled if
- // it is not possible to load the the help page.
+ // it is not possible to load the help page.
bool IsHelpAvailableOnDetailMenu() const {
- if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
- return tray()->detailed_menu_->help_view_->state() ==
- views::Button::STATE_NORMAL;
- }
- return tray()->detailed_menu_->help_view_;
+ return tray()->detailed_menu_->help_view_->state() ==
+ views::Button::STATE_NORMAL;
}
// In material design we show the settings button but theme it as disabled if
- // it is not possible to load the the settings page.
+ // it is not possible to load the settings page.
bool IsSettingsAvailableOnDetailMenu() const {
- if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
- return tray()->detailed_menu_->settings_view_->state() ==
- views::Button::STATE_NORMAL;
- }
- return tray()->detailed_menu_->settings_view_;
+ return tray()->detailed_menu_->settings_view_->state() ==
+ views::Button::STATE_NORMAL;
}
bool IsNotificationShown() const {
« no previous file with comments | « chrome/browser/chromeos/shutdown_policy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698