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

Unified Diff: chrome/browser/ui/views/tabs/window_finder_ozone.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: smaller CL, only with crucial bits (see comment #53) Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc ('k') | chrome/chrome_paks.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc ('k') | chrome/chrome_paks.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698