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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Sync and rebase; add comments. 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 | « no previous file | ash/common/wm_window_property.h » ('j') | ash/mus/window_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index 097733f1e1a7cf595aed0621604e54eefd359d09..e4dd197759e5cb574ccbc00d6dd6f9cbbbd2f347 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -49,12 +49,6 @@ DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindowAura*);
namespace ash {
-DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
-DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);
-DEFINE_WINDOW_PROPERTY_KEY(int,
- kShelfIconResourceIdKey,
- kInvalidImageResourceID);
-
DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindowAura, kWmWindowKey, nullptr);
static_assert(aura::Window::kInitialId == kShellWindowId_Invalid,
« no previous file with comments | « no previous file | ash/common/wm_window_property.h » ('j') | ash/mus/window_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698