Revert of Window prerequisites for ShelfWindowWatcher panel support.

ui/aura/client/aura_constants.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_CLIENT_AURA_CONSTANTS_H_
 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_
 
-#include <string>
-
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ui {
 class InputMethod;
 }
 
 namespace aura {
 namespace client {
 
 // Alphabetical sort.
 
 // A property key to store always-on-top flag.
 AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey;
 
 // A property key to store whether animations are disabled for the window. Type
 // of value is an int.
 AURA_EXPORT extern const WindowProperty<bool>* const kAnimationsDisabledKey;
 
-// A property key to store the app icon, typically larger for shelf icons, etc.
-AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kAppIconKey;
-
-// A property key to store the string id of the app associated with this window.
-AURA_EXPORT extern const WindowProperty<std::string*>* const kAppIdKey;
-
 // A property key to store the type of window that will be used to record
 // pointer metrics. See AppType in ash/shared/app_types.h for more details.
 AURA_EXPORT extern const WindowProperty<int>* const kAppType;
 
 // A property key to store the can-maximize flag.
 AURA_EXPORT extern const WindowProperty<bool>* const kCanMaximizeKey;
 
 // A property key to store the can-minimize flag.
 AURA_EXPORT extern const WindowProperty<bool>* const kCanMinimizeKey;
 
@@ skipping 37 matching lines @@
 
 // The inset of the topmost view in the client view from the top of the
 // non-client view. The topmost view depends on the window type. The topmost
 // view is the tab strip for tabbed browser windows, the toolbar for popups,
 // the web contents for app windows and varies for fullscreen windows.
 AURA_EXPORT extern const aura::WindowProperty<int>* const kTopViewInset;
 
 // The color of the window header.
 AURA_EXPORT extern const aura::WindowProperty<SkColor>* const kTopViewColor;
 
-// A property key to store the window icon, typically 16x16 for title bars.
+// A property key to store window icon.
 AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kWindowIconKey;
 
 // Alphabetical sort.
 
 }  // namespace client
 }  // namespace aura
 
 #endif  // UI_AURA_CLIENT_AURA_CONSTANTS_H_