OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/frame/browser_window_property_manager_win.h" | 5 #include "chrome/browser/ui/views/frame/browser_window_property_manager_win.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 pinned_name, | 97 pinned_name, |
98 hwnd_); | 98 hwnd_); |
99 } | 99 } |
100 | 100 |
101 // static | 101 // static |
102 scoped_ptr<BrowserWindowPropertyManager> | 102 scoped_ptr<BrowserWindowPropertyManager> |
103 BrowserWindowPropertyManager::CreateBrowserWindowPropertyManager( | 103 BrowserWindowPropertyManager::CreateBrowserWindowPropertyManager( |
104 BrowserView* view, HWND hwnd) { | 104 BrowserView* view, HWND hwnd) { |
105 if (base::win::GetVersion() < base::win::VERSION_WIN7 || | 105 if (base::win::GetVersion() < base::win::VERSION_WIN7 || |
106 view->browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) | 106 view->browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) |
107 return scoped_ptr<BrowserWindowPropertyManager>(); | 107 return nullptr; |
108 | 108 |
109 scoped_ptr<BrowserWindowPropertyManager> browser_window_property_manager( | 109 scoped_ptr<BrowserWindowPropertyManager> browser_window_property_manager( |
110 new BrowserWindowPropertyManager(view, hwnd)); | 110 new BrowserWindowPropertyManager(view, hwnd)); |
111 browser_window_property_manager->UpdateWindowProperties(); | 111 browser_window_property_manager->UpdateWindowProperties(); |
112 return browser_window_property_manager.Pass(); | 112 return browser_window_property_manager; |
113 } | 113 } |
114 | 114 |
115 void BrowserWindowPropertyManager::OnProfileIconVersionChange() { | 115 void BrowserWindowPropertyManager::OnProfileIconVersionChange() { |
116 UpdateWindowProperties(); | 116 UpdateWindowProperties(); |
117 } | 117 } |
OLD | NEW |