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

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac 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"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/profiles/profile_shortcut_manager_win.h" 14 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
15 #include "chrome/browser/shell_integration.h" 15 #include "chrome/browser/shell_integration.h"
16 #include "chrome/browser/ui/host_desktop.h"
17 #include "chrome/browser/ui/views/frame/browser_view.h" 16 #include "chrome/browser/ui/views/frame/browser_view.h"
18 #include "chrome/browser/web_applications/web_app.h" 17 #include "chrome/browser/web_applications/web_app.h"
19 #include "chrome/browser/web_applications/web_app_win.h" 18 #include "chrome/browser/web_applications/web_app_win.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "extensions/browser/extension_registry.h" 20 #include "extensions/browser/extension_registry.h"
22 #include "ui/base/win/shell.h" 21 #include "ui/base/win/shell.h"
22 #include "ui/gfx/host_desktop_type.h"
23 #include "ui/views/win/hwnd_util.h" 23 #include "ui/views/win/hwnd_util.h"
24 24
25 using extensions::ExtensionRegistry; 25 using extensions::ExtensionRegistry;
26 26
27 BrowserWindowPropertyManager::BrowserWindowPropertyManager(BrowserView* view) 27 BrowserWindowPropertyManager::BrowserWindowPropertyManager(BrowserView* view)
28 : view_(view) { 28 : view_(view) {
29 DCHECK(view_); 29 DCHECK(view_);
30 profile_pref_registrar_.Init(view_->browser()->profile()->GetPrefs()); 30 profile_pref_registrar_.Init(view_->browser()->profile()->GetPrefs());
31 31
32 // Monitor the profile icon version on Windows so that we can set the browser 32 // Monitor the profile icon version on Windows so that we can set the browser
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
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