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

Side by Side Diff: ash/shell_unittest.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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 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 "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_StatusContainer)); 77 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_StatusContainer));
78 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_MenuContainer)); 78 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_MenuContainer));
79 EXPECT_TRUE(Shell::GetContainer(root_window, 79 EXPECT_TRUE(Shell::GetContainer(root_window,
80 kShellWindowId_DragImageAndTooltipContainer)); 80 kShellWindowId_DragImageAndTooltipContainer));
81 EXPECT_TRUE( 81 EXPECT_TRUE(
82 Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer)); 82 Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer));
83 EXPECT_TRUE( 83 EXPECT_TRUE(
84 Shell::GetContainer(root_window, kShellWindowId_OverlayContainer)); 84 Shell::GetContainer(root_window, kShellWindowId_OverlayContainer));
85 EXPECT_TRUE(Shell::GetContainer(root_window, 85 EXPECT_TRUE(Shell::GetContainer(root_window,
86 kShellWindowId_ImeWindowParentContainer)); 86 kShellWindowId_ImeWindowParentContainer));
87 #if defined(OS_CHROMEOS)
88 EXPECT_TRUE( 87 EXPECT_TRUE(
89 Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer)); 88 Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer));
90 #endif
91 } 89 }
92 90
93 class ModalWindow : public views::WidgetDelegateView { 91 class ModalWindow : public views::WidgetDelegateView {
94 public: 92 public:
95 ModalWindow() {} 93 ModalWindow() {}
96 ~ModalWindow() override {} 94 ~ModalWindow() override {}
97 95
98 // Overridden from views::WidgetDelegate: 96 // Overridden from views::WidgetDelegate:
99 bool CanResize() const override { return true; } 97 bool CanResize() const override { return true; }
100 base::string16 GetWindowTitle() const override { 98 base::string16 GetWindowTitle() const override {
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 private: 502 private:
505 DISALLOW_COPY_AND_ASSIGN(ShellTest2); 503 DISALLOW_COPY_AND_ASSIGN(ShellTest2);
506 }; 504 };
507 505
508 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { 506 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
509 window_.reset(new aura::Window(NULL)); 507 window_.reset(new aura::Window(NULL));
510 window_->Init(ui::LAYER_NOT_DRAWN); 508 window_->Init(ui::LAYER_NOT_DRAWN);
511 } 509 }
512 510
513 } // namespace ash 511 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content/shell_with_content_main.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698