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

Unified Diff: ash/common/system/chromeos/settings/tray_settings.cc

Issue 2457393006: [ash-md] Added ink drop to system menu rows that inherit from ActionableView. (Closed)
Patch Set: Fixed the failing test: 'SpokenFeedbackTest.NavigateSystemTray' Created 4 years, 1 month 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 | « no previous file | ash/common/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/settings/tray_settings.cc
diff --git a/ash/common/system/chromeos/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc
index 0d3030f06338740263394c5dfe00340c17b422f6..5f7f17ba3b788e5fd53a0d1168e5ea783c21a6f1 100644
--- a/ash/common/system/chromeos/settings/tray_settings.cc
+++ b/ash/common/system/chromeos/settings/tray_settings.cc
@@ -4,6 +4,7 @@
#include "ash/common/system/chromeos/settings/tray_settings.h"
+#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/power/power_status_view.h"
@@ -72,6 +73,9 @@ class SettingsDefaultView : public ActionableView,
AddChildView(power_status_view_);
OnPowerStatusChanged();
}
+
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ SetInkDropMode(InkDropHostView::InkDropMode::ON);
}
~SettingsDefaultView() override { PowerStatus::Get()->RemoveObserver(this); }
« no previous file with comments | « no previous file | ash/common/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698