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

Side by Side Diff: ui/aura/client/aura_constants.cc

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/client/aura_constants.h" 5 #include "ui/aura/client/aura_constants.h"
6 6
7 #include "ui/aura/window_property.h" 7 #include "ui/aura/window_property.h"
8 #include "ui/gfx/geometry/rect.h" 8 #include "ui/gfx/geometry/rect.h"
9 9
10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) 10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)
(...skipping 26 matching lines...) Expand all
37 // gfx::Rect object for RestoreBoundsKey property is owned by the window 37 // gfx::Rect object for RestoreBoundsKey property is owned by the window
38 // and will be freed automatically. 38 // and will be freed automatically.
39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);
40 DEFINE_WINDOW_PROPERTY_KEY( 40 DEFINE_WINDOW_PROPERTY_KEY(
41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); 41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
42 DEFINE_WINDOW_PROPERTY_KEY( 42 DEFINE_WINDOW_PROPERTY_KEY(
43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); 43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);
44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); 44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0);
45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); 45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); 46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);
47 48
48 } // namespace client 49 } // namespace client
49 } // namespace aura 50 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698