| 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/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 161 } |
| 162 | 162 |
| 163 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { | 163 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { |
| 164 return chrome::DispositionFromEventFlags(event_flags); | 164 return chrome::DispositionFromEventFlags(event_flags); |
| 165 } | 165 } |
| 166 | 166 |
| 167 #if defined(USE_AURA) | 167 #if defined(USE_AURA) |
| 168 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper( | 168 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper( |
| 169 views::NativeWidgetAura* native_widget) { | 169 views::NativeWidgetAura* native_widget) { |
| 170 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 | 170 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 |
| 171 #if !defined(OS_CHROMEOS) // We don't build this class for ChromeOS. |
| 171 #if defined(USE_ASH) | 172 #if defined(USE_ASH) |
| 172 if (!chrome::ShouldOpenAshOnStartup()) | 173 if (!chrome::ShouldOpenAshOnStartup()) |
| 173 #endif | 174 #endif |
| 174 return new views::DesktopNativeWidgetHelperAura(native_widget); | 175 return new views::DesktopNativeWidgetHelperAura(native_widget); |
| 176 #endif |
| 175 #if defined(USE_ASH) | 177 #if defined(USE_ASH) |
| 176 return NULL; | 178 return NULL; |
| 177 #endif | 179 #endif |
| 178 } | 180 } |
| 179 #endif | 181 #endif |
| 180 | 182 |
| 181 content::WebContents* ChromeViewsDelegate::CreateWebContents( | 183 content::WebContents* ChromeViewsDelegate::CreateWebContents( |
| 182 content::BrowserContext* browser_context, | 184 content::BrowserContext* browser_context, |
| 183 content::SiteInstance* site_instance) { | 185 content::SiteInstance* site_instance) { |
| 184 return NULL; | 186 return NULL; |
| 185 } | 187 } |
| 186 | 188 |
| 187 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget( | 189 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget( |
| 188 views::internal::NativeWidgetDelegate* delegate, | 190 views::internal::NativeWidgetDelegate* delegate, |
| 189 gfx::NativeView parent) { | 191 gfx::NativeView parent) { |
| 190 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 192 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
| 191 if (CommandLine::ForCurrentProcess()->HasSwitch( | 193 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 192 views::switches::kDesktopAura)) | 194 views::switches::kDesktopAura)) |
| 193 return new views::DesktopNativeWidgetAura(delegate); | 195 return new views::DesktopNativeWidgetAura(delegate); |
| 194 #endif | 196 #endif |
| 195 return NULL; | 197 return NULL; |
| 196 } | 198 } |
| OLD | NEW |