Chromium Code Reviews| Index: mandoline/ui/browser/browser.h |
| diff --git a/mandoline/ui/browser/browser.h b/mandoline/ui/browser/browser.h |
| index e7d2c5549c3b907ced25898c66bd4b0c24e61f8e..f125617ac913ab43031262749734eb0c47b5a49e 100644 |
| --- a/mandoline/ui/browser/browser.h |
| +++ b/mandoline/ui/browser/browser.h |
| @@ -26,7 +26,7 @@ class ViewManagerInit; |
| namespace mandoline { |
| -class BrowserManager; |
| +class BrowserDelegate; |
| class BrowserUI; |
| class FrameTree; |
| @@ -37,7 +37,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); |
| @@ -47,6 +47,8 @@ class Browser : public mojo::ViewManagerDelegate, |
| const GURL& current_url() const { return current_url_; } |
| + mojo::ApplicationConnection* GetViewManagerConnectionForTesting(); |
|
sky
2015/06/29 16:56:02
I'm not a fan of public functions for testing. I p
Fady Samuel
2015/06/29 20:32:36
Done.
|
| + |
| // Called once a valid device_pixel_ratio is determined. We gate construction |
| // of the UI until the device_pixel_ratio is available as it's necessary to |
| // properly setup the ui. |
| @@ -98,7 +100,7 @@ class Browser : public mojo::ViewManagerDelegate, |
| scoped_ptr<BrowserUI> ui_; |
| mojo::ApplicationImpl* app_; |
| - BrowserManager* browser_manager_; |
| + BrowserDelegate* delegate_; |
| scoped_ptr<FrameTree> frame_tree_; |