Properly mark windows for event dispatch in mushrome and fix frames

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
index 0a2535e4773cbb6655374282ec901758096b4f9d..3a41eacdf0dcd2eb8d366812c7d65bfa33c76167 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -4,24 +4,17 @@
 
 #include "build/build_config.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
 #include "services/service_manager/runner/common/client_util.h"
 #endif
 
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
-#endif
-
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 #endif
 
-#if defined(USE_ASH)
-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
-#endif
-
 namespace chrome {
 
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
@@ -35,18 +28,11 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     return frame_view;
   }
 #endif
-#if defined(USE_ASH)
-  BrowserNonClientFrameViewAsh* frame_view =
-      new BrowserNonClientFrameViewAsh(frame, browser_view);
-  frame_view->Init();
-  return frame_view;
-#else
 #if defined(OS_WIN)
   if (frame->ShouldUseNativeFrame())
     return new GlassBrowserFrameView(frame, browser_view);
 #endif
   return new OpaqueBrowserFrameView(frame, browser_view);
-#endif  // USE_ASH
 }
 
 }  // namespace chrome