Index: mandoline/ui/browser/browser.h |
diff --git a/mandoline/ui/browser/browser.h b/mandoline/ui/browser/browser.h |
index e8d737a13b90964c09077db857b4f8cd894ffc2c..3347084aa62922d34092ea0c52856be5993dd19d 100644 |
--- a/mandoline/ui/browser/browser.h |
+++ b/mandoline/ui/browser/browser.h |
@@ -8,7 +8,6 @@ |
#include "base/memory/weak_ptr.h" |
#include "components/view_manager/public/cpp/view_manager.h" |
#include "components/view_manager/public/cpp/view_manager_delegate.h" |
-#include "components/view_manager/public/cpp/view_observer.h" |
#include "components/window_manager/window_manager_app.h" |
#include "components/window_manager/window_manager_delegate.h" |
#include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" |
@@ -21,11 +20,11 @@ |
namespace mandoline { |
+class BrowserUI; |
class MergedServiceProvider; |
class Browser : public mojo::ApplicationDelegate, |
public mojo::ViewManagerDelegate, |
- public mojo::ViewObserver, |
public window_manager::WindowManagerDelegate, |
public mojo::InterfaceFactory<mojo::NavigatorHost> { |
public: |
@@ -50,12 +49,6 @@ class Browser : public mojo::ApplicationDelegate, |
mojo::ServiceProviderPtr exposed_services) override; |
void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; |
- // Overriden from mojo::ViewObserver: |
- void OnViewDestroyed(mojo::View* view) override; |
- void OnViewBoundsChanged(mojo::View* view, |
- const mojo::Rect& old_bounds, |
- const mojo::Rect& new_bounds) override; |
- |
// Overridden from WindowManagerDelegate: |
void Embed(const mojo::String& url, |
mojo::InterfaceRequest<mojo::ServiceProvider> services, |
@@ -68,6 +61,8 @@ class Browser : public mojo::ApplicationDelegate, |
void Create(mojo::ApplicationConnection* connection, |
mojo::InterfaceRequest<mojo::NavigatorHost> request) override; |
+ void LayoutContent(); |
+ |
scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; |
// Only support being embedded once, so both application-level |
@@ -82,6 +77,8 @@ class Browser : public mojo::ApplicationDelegate, |
NavigatorHostImpl navigator_host_; |
+ scoped_ptr<BrowserUI> ui_; |
+ |
base::WeakPtrFactory<Browser> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(Browser); |