| 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/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 | 153 |
| 154 void ChromeViewsDelegate::AddRef() { | 154 void ChromeViewsDelegate::AddRef() { |
| 155 g_browser_process->AddRefModule(); | 155 g_browser_process->AddRefModule(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 void ChromeViewsDelegate::ReleaseRef() { | 158 void ChromeViewsDelegate::ReleaseRef() { |
| 159 g_browser_process->ReleaseModule(); | 159 g_browser_process->ReleaseModule(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { | 162 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { |
| 163 return browser::DispositionFromEventFlags(event_flags); | 163 return chrome::DispositionFromEventFlags(event_flags); |
| 164 } | 164 } |
| 165 | 165 |
| 166 #if defined(USE_AURA) | 166 #if defined(USE_AURA) |
| 167 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper( | 167 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper( |
| 168 views::NativeWidgetAura* native_widget) { | 168 views::NativeWidgetAura* native_widget) { |
| 169 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 | 169 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 |
| 170 #if defined(USE_ASH) | 170 #if defined(USE_ASH) |
| 171 if (!chrome::ShouldOpenAshOnStartup()) | 171 if (!chrome::ShouldOpenAshOnStartup()) |
| 172 #endif | 172 #endif |
| 173 return new views::DesktopNativeWidgetHelperAura(native_widget); | 173 return new views::DesktopNativeWidgetHelperAura(native_widget); |
| 174 #if defined(USE_ASH) | 174 #if defined(USE_ASH) |
| 175 return NULL; | 175 return NULL; |
| 176 #endif | 176 #endif |
| 177 } | 177 } |
| 178 #endif | 178 #endif |
| 179 | 179 |
| 180 content::WebContents* ChromeViewsDelegate::CreateWebContents( | 180 content::WebContents* ChromeViewsDelegate::CreateWebContents( |
| 181 content::BrowserContext* browser_context, | 181 content::BrowserContext* browser_context, |
| 182 content::SiteInstance* site_instance) { | 182 content::SiteInstance* site_instance) { |
| 183 return NULL; | 183 return NULL; |
| 184 } | 184 } |
| OLD | NEW |