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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2702423004: Validate incoming window properties. (Closed)
Patch Set: sky comments 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 | « ash/public/cpp/shelf_types.cc ('k') | ui/aura/mus/property_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index c09617c3cc23de781dde79365282e5c2d0bb764e..9e4bffe97840db0607671ba8af46a6a96f6b99c3 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -45,12 +45,15 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
views::MusClient* mus_client = views::MusClient::Get();
aura::WindowTreeClientDelegate* delegate = mus_client;
aura::PropertyConverter* converter = delegate->GetPropertyConverter();
+
converter->RegisterProperty(
ash::kPanelAttachedKey,
- ui::mojom::WindowManager::kPanelAttached_Property);
+ ui::mojom::WindowManager::kPanelAttached_Property,
+ aura::PropertyConverter::CreateAcceptAnyValueCallback());
converter->RegisterProperty(
ash::kShelfItemTypeKey,
- ui::mojom::WindowManager::kShelfItemType_Property);
+ ui::mojom::WindowManager::kShelfItemType_Property,
+ base::Bind(&ash::IsValidShelfItemType));
mus_client->SetMusPropertyMirror(
base::MakeUnique<ash::MusPropertyMirrorAsh>());
« no previous file with comments | « ash/public/cpp/shelf_types.cc ('k') | ui/aura/mus/property_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698