Index: mandoline/ui/browser/browser_manager.cc |
diff --git a/mandoline/ui/browser/browser_manager.cc b/mandoline/ui/browser/browser_manager.cc |
index 7d828fc9a8d1f25242b774ae3376423febab2f56..45e1180dfbd2a37944a894bf77aa99a43b3d39e4 100644 |
--- a/mandoline/ui/browser/browser_manager.cc |
+++ b/mandoline/ui/browser/browser_manager.cc |
@@ -65,28 +65,6 @@ Browser* BrowserManager::CreateBrowser() { |
return browser; |
} |
-void BrowserManager::BrowserClosed(Browser* browser) { |
- scoped_ptr<Browser> browser_owner(browser); |
- DCHECK_GT(browsers_.count(browser), 0u); |
- browsers_.erase(browser); |
- if (browsers_.empty()) |
- app_->Terminate(); |
-} |
- |
-bool BrowserManager::InitUIIfNecessary(Browser* browser, mojo::View* view) { |
- if (view->viewport_metrics().device_pixel_ratio > 0) { |
-#if defined(USE_AURA) |
- if (!aura_init_) |
- aura_init_.reset(new AuraInit(view, app_->shell())); |
-#endif |
- return true; |
- } |
- DCHECK(!device_pixel_ratio_waiter_.get()); |
- device_pixel_ratio_waiter_.reset( |
- new DevicePixelRatioWaiter(this, browser, view)); |
- return false; |
-} |
- |
void BrowserManager::OnDevicePixelRatioAvailable(Browser* browser, |
mojo::View* view) { |
device_pixel_ratio_waiter_.reset(); |
@@ -117,6 +95,28 @@ bool BrowserManager::ConfigureIncomingConnection( |
return true; |
} |
+void BrowserManager::BrowserClosed(Browser* browser) { |
+ scoped_ptr<Browser> browser_owner(browser); |
+ DCHECK_GT(browsers_.count(browser), 0u); |
+ browsers_.erase(browser); |
+ if (browsers_.empty()) |
+ app_->Terminate(); |
+} |
+ |
+bool BrowserManager::InitUIIfNecessary(Browser* browser, mojo::View* view) { |
+ if (view->viewport_metrics().device_pixel_ratio > 0) { |
+#if defined(USE_AURA) |
+ if (!aura_init_) |
+ aura_init_.reset(new AuraInit(view, app_->shell())); |
+#endif |
+ return true; |
+ } |
+ DCHECK(!device_pixel_ratio_waiter_.get()); |
+ device_pixel_ratio_waiter_.reset( |
+ new DevicePixelRatioWaiter(this, browser, view)); |
+ return false; |
+} |
+ |
void BrowserManager::Create(mojo::ApplicationConnection* connection, |
mojo::InterfaceRequest<LaunchHandler> request) { |
launch_handler_bindings_.AddBinding(this, request.Pass()); |