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

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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/common/wm/window_positioner.h" 5 #include "ash/common/wm/window_positioner.h"
6 #include "ash/common/wm/window_resizer.h" 6 #include "ash/common/wm/window_resizer.h"
7 #include "ash/common/wm/window_state.h" 7 #include "ash/common/wm/window_state.h"
8 #include "ash/scoped_target_root_window.h" 8 #include "ash/scoped_target_root_window.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "ash/test/test_shell_delegate.h"
13 #include "ash/wm/window_state_aura.h" 12 #include "ash/wm/window_state_aura.h"
14 #include "base/compiler_specific.h"
15 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
16 #include "build/build_config.h" 14 #include "build/build_config.h"
17 #include "chrome/browser/ui/ash/ash_util.h" 15 #include "chrome/browser/ui/ash/ash_util.h"
18 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" 17 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h"
20 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
21 #include "chrome/test/base/test_browser_window_aura.h" 19 #include "chrome/test/base/test_browser_window_aura.h"
22 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
23 #include "content/public/test/render_view_test.h" 21 #include "content/public/test/render_view_test.h"
24 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 EXPECT_EQ( 865 EXPECT_EQ(
868 ui::SHOW_STATE_DEFAULT, 866 ui::SHOW_STATE_DEFAULT,
869 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, 867 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
870 trusted_popup.get(), p1280x1024, p1600x1200)); 868 trusted_popup.get(), p1280x1024, p1600x1200));
871 // A popup that is sized to occupy the whole work area has default state. 869 // A popup that is sized to occupy the whole work area has default state.
872 EXPECT_EQ( 870 EXPECT_EQ(
873 ui::SHOW_STATE_DEFAULT, 871 ui::SHOW_STATE_DEFAULT,
874 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, 872 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
875 trusted_popup.get(), p1600x1200, p1600x1200)); 873 trusted_popup.get(), p1600x1200, p1600x1200));
876 } 874 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/window_positioner_unittest.cc ('k') | components/arc/intent_helper/arc_intent_helper_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698