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

Side by Side Diff: ash/shell_unittest.cc

Issue 503383002: Allow component IME extension use app.window and add 'ime' window type for app window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reviews Created 6 years, 3 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/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 kShellWindowId_LockSystemModalContainer)); 75 kShellWindowId_LockSystemModalContainer));
76 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_StatusContainer)); 76 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_StatusContainer));
77 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_MenuContainer)); 77 EXPECT_TRUE(Shell::GetContainer(root_window, kShellWindowId_MenuContainer));
78 EXPECT_TRUE(Shell::GetContainer(root_window, 78 EXPECT_TRUE(Shell::GetContainer(root_window,
79 kShellWindowId_DragImageAndTooltipContainer)); 79 kShellWindowId_DragImageAndTooltipContainer));
80 EXPECT_TRUE( 80 EXPECT_TRUE(
81 Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer)); 81 Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer));
82 EXPECT_TRUE( 82 EXPECT_TRUE(
83 Shell::GetContainer(root_window, kShellWindowId_OverlayContainer)); 83 Shell::GetContainer(root_window, kShellWindowId_OverlayContainer));
84 EXPECT_TRUE(Shell::GetContainer( 84 EXPECT_TRUE(Shell::GetContainer(
85 root_window, kShellWindowId_VirtualKeyboardParentContainer)); 85 root_window, kShellWindowId_ImeWindowParentContainer));
86 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
87 EXPECT_TRUE( 87 EXPECT_TRUE(
88 Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer)); 88 Shell::GetContainer(root_window, kShellWindowId_MouseCursorContainer));
89 #endif 89 #endif
90 } 90 }
91 91
92 class ModalWindow : public views::WidgetDelegateView { 92 class ModalWindow : public views::WidgetDelegateView {
93 public: 93 public:
94 ModalWindow() {} 94 ModalWindow() {}
95 virtual ~ModalWindow() {} 95 virtual ~ModalWindow() {}
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 private: 533 private:
534 DISALLOW_COPY_AND_ASSIGN(ShellTest2); 534 DISALLOW_COPY_AND_ASSIGN(ShellTest2);
535 }; 535 };
536 536
537 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { 537 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
538 window_.reset(new aura::Window(NULL)); 538 window_.reset(new aura::Window(NULL));
539 window_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 539 window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
540 } 540 }
541 541
542 } // namespace ash 542 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698