Index: chrome/browser/ui/views/frame/browser_window_property_manager_win.cc |
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc |
index 42f7804538c89d90841d61a14ac0c253d6303904..99c5e0a53d502ecffa29d4d167cf7bec873b74d8 100644 |
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc |
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc |
@@ -104,12 +104,12 @@ scoped_ptr<BrowserWindowPropertyManager> |
BrowserView* view, HWND hwnd) { |
if (base::win::GetVersion() < base::win::VERSION_WIN7 || |
view->browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) |
- return scoped_ptr<BrowserWindowPropertyManager>(); |
+ return nullptr; |
scoped_ptr<BrowserWindowPropertyManager> browser_window_property_manager( |
new BrowserWindowPropertyManager(view, hwnd)); |
browser_window_property_manager->UpdateWindowProperties(); |
- return browser_window_property_manager.Pass(); |
+ return browser_window_property_manager; |
} |
void BrowserWindowPropertyManager::OnProfileIconVersionChange() { |