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

Side by Side Diff: ui/aura_shell/workspace/workspace_manager_unittest.cc

Issue 8968022: Shell related switches -> aura shell switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura_shell/workspace/workspace.cc ('k') | ui/aura_shell/workspace_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_shell/workspace/workspace_manager.h" 5 #include "ui/aura_shell/workspace/workspace_manager.h"
6 6
7 #include "ui/aura/client/aura_constants.h" 7 #include "ui/aura/client/aura_constants.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/screen_aura.h" 9 #include "ui/aura/screen_aura.h"
10 #include "ui/aura/test/aura_test_base.h" 10 #include "ui/aura/test/aura_test_base.h"
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 Workspace* ws = manager_->CreateWorkspace(); 543 Workspace* ws = manager_->CreateWorkspace();
544 scoped_ptr<Window> w1(CreateTestWindow()); 544 scoped_ptr<Window> w1(CreateTestWindow());
545 scoped_ptr<Window> w2(CreateTestWindow()); 545 scoped_ptr<Window> w2(CreateTestWindow());
546 ws->AddWindowAfter(w1.get(), NULL); 546 ws->AddWindowAfter(w1.get(), NULL);
547 ws->AddWindowAfter(w2.get(), NULL); 547 ws->AddWindowAfter(w2.get(), NULL);
548 w1->Show(); 548 w1->Show();
549 w2->Show(); 549 w2->Show();
550 550
551 EXPECT_FALSE(ws->ContainsFullscreenWindow()); 551 EXPECT_FALSE(ws->ContainsFullscreenWindow());
552 552
553 w1->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); 553 w1->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
554 EXPECT_TRUE(ws->ContainsFullscreenWindow()); 554 EXPECT_TRUE(ws->ContainsFullscreenWindow());
555 555
556 w1->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); 556 w1->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
557 EXPECT_FALSE(ws->ContainsFullscreenWindow()); 557 EXPECT_FALSE(ws->ContainsFullscreenWindow());
558 558
559 w2->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); 559 w2->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
560 EXPECT_TRUE(ws->ContainsFullscreenWindow()); 560 EXPECT_TRUE(ws->ContainsFullscreenWindow());
561 561
562 w2->Hide(); 562 w2->Hide();
563 EXPECT_FALSE(ws->ContainsFullscreenWindow()); 563 EXPECT_FALSE(ws->ContainsFullscreenWindow());
564 } 564 }
565 565
566 } // namespace internal 566 } // namespace internal
567 } // namespace aura_shell 567 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/workspace/workspace.cc ('k') | ui/aura_shell/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698