OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_views_delegate.h" | 5 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/prefs/pref_service.h" |
9 #include "base/string_util.h" | 10 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/prefs/pref_service.h" | |
13 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 13 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views
.h" | 15 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views
.h" |
16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
17 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
19 #include "ui/views/widget/native_widget.h" | 19 #include "ui/views/widget/native_widget.h" |
20 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
21 | 21 |
22 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 // should remove this check here. | 224 // should remove this check here. |
225 gfx::NativeView to_check = | 225 gfx::NativeView to_check = |
226 params->context ? params->context : params->parent; | 226 params->context ? params->context : params->parent; |
227 if (chrome::GetHostDesktopTypeForNativeView(to_check) == | 227 if (chrome::GetHostDesktopTypeForNativeView(to_check) == |
228 chrome::HOST_DESKTOP_TYPE_NATIVE) { | 228 chrome::HOST_DESKTOP_TYPE_NATIVE) { |
229 params->native_widget = new views::DesktopNativeWidgetAura(delegate); | 229 params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
230 } | 230 } |
231 } | 231 } |
232 #endif | 232 #endif |
233 } | 233 } |
OLD | NEW |