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

Unified Diff: mandoline/ui/browser/browser.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.h
diff --git a/mandoline/ui/browser/browser.h b/mandoline/ui/browser/browser.h
index e7d2c5549c3b907ced25898c66bd4b0c24e61f8e..64954ba437097a25e8389575b01a4d9dacc1e30f 100644
--- a/mandoline/ui/browser/browser.h
+++ b/mandoline/ui/browser/browser.h
@@ -5,6 +5,7 @@
#ifndef MANDOLINE_UI_BROWSER_BROWSER_H_
#define MANDOLINE_UI_BROWSER_BROWSER_H_
+#include "base/gtest_prod_util.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_manager_init.h"
@@ -26,7 +27,9 @@ class ViewManagerInit;
namespace mandoline {
-class BrowserManager;
+FORWARD_DECLARE_TEST(BrowserTest, ClosingBrowserClosesAppConnection);
+
+class BrowserDelegate;
class BrowserUI;
class FrameTree;
@@ -37,7 +40,7 @@ class Browser : public mojo::ViewManagerDelegate,
public mojo::InterfaceFactory<mojo::NavigatorHost>,
public mojo::InterfaceFactory<ViewEmbedder> {
public:
- Browser(mojo::ApplicationImpl* app, BrowserManager* browser_manager);
+ Browser(mojo::ApplicationImpl* app, BrowserDelegate* delegate);
~Browser() override;
void ReplaceContentWithRequest(mojo::URLRequestPtr request);
@@ -54,6 +57,10 @@ class Browser : public mojo::ViewManagerDelegate,
void OnDevicePixelRatioAvailable();
private:
+ FRIEND_TEST_ALL_PREFIXES(BrowserTest, ClosingBrowserClosesAppConnection);
+
+ mojo::ApplicationConnection* GetViewManagerConnectionForTesting();
+
// Overridden from mojo::ViewManagerDelegate:
void OnEmbed(mojo::View* root) override;
void OnEmbedForDescendant(mojo::View* view,
@@ -98,7 +105,7 @@ class Browser : public mojo::ViewManagerDelegate,
scoped_ptr<BrowserUI> ui_;
mojo::ApplicationImpl* app_;
- BrowserManager* browser_manager_;
+ BrowserDelegate* delegate_;
scoped_ptr<FrameTree> frame_tree_;

Powered by Google App Engine
This is Rietveld 408576698