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

Unified Diff: ash/test/test_system_tray_delegate.cc

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 3 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 | « ash/test/test_system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_system_tray_delegate.cc
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc
index 1ffe01a306d86b80bcf4665b0c0cb2b25db64440..0b92b3d237bce9823bc7ecb297433147292d15c0 100644
--- a/ash/test/test_system_tray_delegate.cc
+++ b/ash/test/test_system_tray_delegate.cc
@@ -15,7 +15,6 @@
#if defined(OS_CHROMEOS)
#include "ash/system/chromeos/rotation/tray_rotation_lock.h"
-#include "ash/system/chromeos/tray_display.h"
#include "base/memory/ptr_util.h"
#else
#include "ash/common/system/tray/system_tray_item.h"
@@ -124,15 +123,6 @@ void TestSystemTrayDelegate::SignOut() {
base::MessageLoop::current()->QuitWhenIdle();
}
-std::unique_ptr<SystemTrayItem> TestSystemTrayDelegate::CreateDisplayTrayItem(
- SystemTray* tray) {
-#if defined(OS_CHROMEOS)
- return base::MakeUnique<TrayDisplay>(tray);
-#else
- return nullptr;
-#endif
-}
-
std::unique_ptr<SystemTrayItem>
TestSystemTrayDelegate::CreateRotationLockTrayItem(SystemTray* tray) {
#if defined(OS_CHROMEOS)
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698