Do not include x11 files in case of Ozone builds

chrome/browser/ui/views/frame/browser_frame.cc

 // Copyright (c) 2012 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/frame/browser_frame.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 22 matching lines @@
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "components/user_manager/user_manager.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)

[Lei Zhang, 2017/05/22 18:20:12]

How about just if defined(USE_X11) ?

 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
     : native_browser_frame_(nullptr),
       root_view_(nullptr),
       browser_frame_view_(nullptr),
@@ skipping 223 matching lines @@
   return menu_model_builder_->menu_model();
 }
 
 views::View* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->GetProfileSwitcherView();
 }
 
 void BrowserFrame::OnMenuClosed() {
   menu_runner_.reset();
 }