diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 00:04:59 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 00:04:59 +0000 |
| commit | 45214559b6f71458336f00f850e02e43d3cd8415 (patch) | |
| tree | 599c94853f179cbf614c043ae61ce6139005f483 /ash | |
| parent | b1e93abe8fe317771862c42652312bf36ac4b11a (diff) | |
| download | chromium_src-45214559b6f71458336f00f850e02e43d3cd8415.zip chromium_src-45214559b6f71458336f00f850e02e43d3cd8415.tar.gz chromium_src-45214559b6f71458336f00f850e02e43d3cd8415.tar.bz2 | |
3rd part of porting Chrome Ash to Windows 7
This is the Chrome side that
1- removes windows 8 specific checks
2- disconnects the fake window_tree_host_win
3- connects the remote_window_tree_host_win
With this change you can now see the ash desktop but not interact with
it since input events have not been enabled.
Here is the second part
https://codereview.chromium.org/211863003/
First part with rationale:
https://codereview.chromium.org/199843004/
Note: this is a redo & rebase of
https://codereview.chromium.org/227573007/
BUG=356475
TEST=none
patch from issue 235683005
BUG=
Review URL: https://codereview.chromium.org/235933004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/host/ash_window_tree_host_win.cc | 2 | ||||
| -rw-r--r-- | ash/test/ash_test_helper.cc | 4 | ||||
| -rw-r--r-- | ash/wm/workspace/workspace_event_handler_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ash/host/ash_window_tree_host_win.cc b/ash/host/ash_window_tree_host_win.cc index 5ea0f4a..27fd5a4 100644 --- a/ash/host/ash_window_tree_host_win.cc +++ b/ash/host/ash_window_tree_host_win.cc @@ -108,7 +108,7 @@ class ASH_EXPORT AshWindowTreeHostWin : public AshWindowTreeHost, } // namespace AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { - if (base::win::GetVersion() >= base::win::VERSION_WIN8 && + if (base::win::GetVersion() >= base::win::VERSION_WIN7 && !CommandLine::ForCurrentProcess()->HasSwitch( ash::switches::kForceAshToDesktop)) return AshRemoteWindowTreeHostWin::GetInstance(); diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 75034c5..f9e812c 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -154,7 +154,7 @@ aura::Window* AshTestHelper::CurrentContext() { // static bool AshTestHelper::SupportsMultipleDisplays() { #if defined(OS_WIN) - return base::win::GetVersion() < base::win::VERSION_WIN8; + return false; #else return true; #endif @@ -163,7 +163,7 @@ bool AshTestHelper::SupportsMultipleDisplays() { // static bool AshTestHelper::SupportsHostWindowResize() { #if defined(OS_WIN) - return base::win::GetVersion() < base::win::VERSION_WIN8; + return false; #else return true; #endif diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index ce69947..f9a1e1a3 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -142,7 +142,7 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisResizeEdge) { #if defined(OS_WIN) // Multi display test does not run on Win8 bot. crbug.com/247427. - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + if (!SupportsMultipleDisplays()) return; #endif |