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

Unified Diff: ash/wm/frame_painter_unittest.cc

Issue 23496024: Introduce RootWindowProperty for RootWindow's properties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename Created 7 years, 4 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/wm/frame_painter.cc ('k') | ash/wm/property_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/frame_painter_unittest.cc
diff --git a/ash/wm/frame_painter_unittest.cc b/ash/wm/frame_painter_unittest.cc
index a669f8a5636166e853bd83bcac244dfb60037ce5..f412afd4e915bbf82d5cb26292deaee44e34ba6c 100644
--- a/ash/wm/frame_painter_unittest.cc
+++ b/ash/wm/frame_painter_unittest.cc
@@ -5,11 +5,11 @@
#include "ash/wm/frame_painter.h"
#include "ash/ash_constants.h"
+#include "ash/root_window_settings.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/property_util.h"
-#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/frame_caption_button_container_view.h"
#include "base/memory/scoped_ptr.h"
@@ -216,18 +216,18 @@ TEST_F(FramePainterTest, CreateAndDeleteSingleWindow) {
// We only have one window, so it should use a solo header.
EXPECT_TRUE(painter->UseSoloWindowHeader());
- EXPECT_TRUE(root->GetProperty(internal::kSoloWindowHeaderKey));
+ EXPECT_TRUE(internal::GetRootWindowSettings(root)->solo_window_header);
// Close the window.
widget.reset();
- EXPECT_FALSE(root->GetProperty(internal::kSoloWindowHeaderKey));
+ EXPECT_FALSE(internal::GetRootWindowSettings(root)->solo_window_header);
// Recreate another window again.
widget.reset(CreateTestWidget());
painter.reset(CreateTestPainter(widget.get()));
widget->Show();
EXPECT_TRUE(painter->UseSoloWindowHeader());
- EXPECT_TRUE(root->GetProperty(internal::kSoloWindowHeaderKey));
+ EXPECT_TRUE(internal::GetRootWindowSettings(root)->solo_window_header);
}
TEST_F(FramePainterTest, UseSoloWindowHeader) {
« no previous file with comments | « ash/wm/frame_painter.cc ('k') | ash/wm/property_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698