Chromium Code Reviews| Index: chrome/browser/ui/views/tabs/window_finder_ozone.cc |
| diff --git a/chrome/browser/ui/views/tabs/window_finder_chromeos.cc b/chrome/browser/ui/views/tabs/window_finder_ozone.cc |
| similarity index 63% |
| copy from chrome/browser/ui/views/tabs/window_finder_chromeos.cc |
| copy to chrome/browser/ui/views/tabs/window_finder_ozone.cc |
| index 0bc9248398fcc53bf669df046d6c9ae5daa900e6..0fadcd00fd750f1e16b4609220d2d144cb5d4ae6 100644 |
| --- a/chrome/browser/ui/views/tabs/window_finder_chromeos.cc |
| +++ b/chrome/browser/ui/views/tabs/window_finder_ozone.cc |
| @@ -1,15 +1,10 @@ |
| -// Copyright 2014 The Chromium Authors. All rights reserved. |
| +// Copyright 2016 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| #include "chrome/browser/ui/views/tabs/window_finder.h" |
| -#include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
| - |
| -#include "ui/aura/window.h" |
|
fwang
2016/11/03 07:56:22
Why this new line?
tonikitoo
2016/11/03 12:52:29
should not be needed. Will fix.
BTW, window_finde
|
| -gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
| - const gfx::Point& screen_point, |
| - const std::set<gfx::NativeWindow>& ignore); |
| +#include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
| gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
| const gfx::Point& screen_point, |
| @@ -18,5 +13,6 @@ gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
| if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) |
| return mus_result; |
| - return GetLocalProcessWindowAtPointAsh(screen_point, ignore); |
| + NOTREACHED() << "For Ozone builds, only --mash launch is supported for now."; |
| + return nullptr; |
| } |