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

Unified Diff: mandoline/ui/browser/browser_manager.h

Issue 1195003002: Mandoline: Introduce ApplicationConnection::CloseConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 years, 6 months 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: mandoline/ui/browser/browser_manager.h
diff --git a/mandoline/ui/browser/browser_manager.h b/mandoline/ui/browser/browser_manager.h
index cb2927b7b43195744a8bc36960b6ee9e2eb2104a..2624c81c76a925c8b9c93e3652d06ec20f2b61c9 100644
--- a/mandoline/ui/browser/browser_manager.h
+++ b/mandoline/ui/browser/browser_manager.h
@@ -8,6 +8,7 @@
#include <set>
#include "base/memory/scoped_vector.h"
+#include "mandoline/ui/browser/browser_delegate.h"
#include "mandoline/ui/browser/public/interfaces/launch_handler.mojom.h"
#include "mojo/application/public/cpp/application_delegate.h"
#include "mojo/application/public/cpp/application_impl.h"
@@ -28,6 +29,7 @@ class Browser;
// BrowserManager creates and manages the lifetime of Browsers.
class BrowserManager : public mojo::ApplicationDelegate,
+ public BrowserDelegate,
public LaunchHandler,
public mojo::InterfaceFactory<LaunchHandler> {
public:
@@ -37,11 +39,6 @@ class BrowserManager : public mojo::ApplicationDelegate,
// BrowserManager owns the returned Browser.
Browser* CreateBrowser();
- // Invoked by |browser| when it has closed.
- void BrowserClosed(Browser* browser);
-
- bool InitUIIfNecessary(Browser* browser, mojo::View* view);
-
private:
class DevicePixelRatioWaiter;
@@ -55,6 +52,10 @@ class BrowserManager : public mojo::ApplicationDelegate,
bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override;
+ // Overridden from BrowserDelegate:
+ bool InitUIIfNecessary(Browser* browser, mojo::View* view) override;
+ void BrowserClosed(Browser* browser) override;
+
// Overridden from mojo::InterfaceFactory<LaunchHandler>:
void Create(mojo::ApplicationConnection* connection,
mojo::InterfaceRequest<LaunchHandler> request) override;

Powered by Google App Engine
This is Rietveld 408576698