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

Side by Side Diff: chrome/browser/ui/views/frame/browser_window_property_manager_win.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 unified diff | Download patch
OLDNEW
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/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 command_line_string, 93 command_line_string,
94 pinned_name, 94 pinned_name,
95 hwnd); 95 hwnd);
96 } 96 }
97 97
98 // static 98 // static
99 scoped_ptr<BrowserWindowPropertyManager> 99 scoped_ptr<BrowserWindowPropertyManager>
100 BrowserWindowPropertyManager::CreateBrowserWindowPropertyManager( 100 BrowserWindowPropertyManager::CreateBrowserWindowPropertyManager(
101 BrowserView* view) { 101 BrowserView* view) {
102 if (base::win::GetVersion() < base::win::VERSION_WIN7 || 102 if (base::win::GetVersion() < base::win::VERSION_WIN7 ||
103 view->browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) { 103 view->browser()->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH) {
104 return scoped_ptr<BrowserWindowPropertyManager>(); 104 return scoped_ptr<BrowserWindowPropertyManager>();
105 } 105 }
106 106
107 return scoped_ptr<BrowserWindowPropertyManager>( 107 return scoped_ptr<BrowserWindowPropertyManager>(
108 new BrowserWindowPropertyManager(view)); 108 new BrowserWindowPropertyManager(view));
109 } 109 }
110 110
111 void BrowserWindowPropertyManager::OnProfileIconVersionChange() { 111 void BrowserWindowPropertyManager::OnProfileIconVersionChange() {
112 UpdateWindowProperties(views::HWNDForNativeWindow(view_->GetNativeWindow())); 112 UpdateWindowProperties(views::HWNDForNativeWindow(view_->GetNativeWindow()));
113 } 113 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698