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

Unified Diff: ui/aura/root_window_host_mac.h

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
Index: ui/aura/root_window_host_mac.h
diff --git a/ui/aura/root_window_host_ozone.h b/ui/aura/root_window_host_mac.h
similarity index 64%
copy from ui/aura/root_window_host_ozone.h
copy to ui/aura/root_window_host_mac.h
index 41f6a8e181fa290f5754b47a3da6c9e185a8223a..e3e9340cd2715559730b6dfb2a9a29433d00636f 100644
--- a/ui/aura/root_window_host_ozone.h
+++ b/ui/aura/root_window_host_mac.h
@@ -1,29 +1,32 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
-#ifndef UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
-#define UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#ifndef UI_AURA_ROOT_WINDOW_HOST_MAC_H_
+#define UI_AURA_ROOT_WINDOW_HOST_MAC_H_
#include <vector>
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
+#include "base/mac/scoped_nsobject.h"
+#include "ui/aura/aura_export.h"
#include "ui/aura/window_tree_host.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/rect.h"
+namespace ui {
+class MouseEvent;
+}
+
namespace aura {
-class RootWindowHostOzone : public RootWindowHost,
- public base::MessageLoop::Dispatcher {
- public:
- explicit RootWindowHostOzone(const gfx::Rect& bounds);
- virtual ~RootWindowHostOzone();
+namespace internal {
+class TouchEventCalibrate;
+}
- private:
- // Overridden from Dispatcher overrides:
- virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
+class AURA_EXPORT RootWindowHostMac : public RootWindowHost {
+ public:
+ explicit RootWindowHostMac(const gfx::Rect& bounds);
+ virtual ~RootWindowHostMac();
// RootWindowHost Overrides.
virtual RootWindow* GetRootWindow() OVERRIDE;
@@ -34,7 +37,7 @@ class RootWindowHostOzone : public RootWindowHost,
virtual gfx::Rect GetBounds() const OVERRIDE;
virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
virtual gfx::Insets GetInsets() const OVERRIDE;
- virtual void SetInsets(const gfx::Insets& bounds) OVERRIDE;
+ virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE;
@@ -48,12 +51,12 @@ class RootWindowHostOzone : public RootWindowHost,
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void PrepareForShutdown() OVERRIDE;
- gfx::AcceleratedWidget widget_;
- gfx::Rect bounds_;
+ private:
+ base::scoped_nsobject<NSWindow> window_;
- DISALLOW_COPY_AND_ASSIGN(RootWindowHostOzone);
+ DISALLOW_COPY_AND_ASSIGN(RootWindowHostMac);
};
} // namespace aura
-#endif // UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#endif // UI_AURA_ROOT_WINDOW_HOST_MAC_H_

Powered by Google App Engine
This is Rietveld 408576698