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

Side by Side Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 10909223: views: Rename win-aura flag to desktop-aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 content::WebContents* ChromeViewsDelegate::CreateWebContents( 181 content::WebContents* ChromeViewsDelegate::CreateWebContents(
182 content::BrowserContext* browser_context, 182 content::BrowserContext* browser_context,
183 content::SiteInstance* site_instance) { 183 content::SiteInstance* site_instance) {
184 return NULL; 184 return NULL;
185 } 185 }
186 186
187 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget( 187 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
188 views::internal::NativeWidgetDelegate* delegate, 188 views::internal::NativeWidgetDelegate* delegate,
189 gfx::NativeView parent) { 189 gfx::NativeView parent) {
190 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 190 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
191 if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura)) 191 if (CommandLine::ForCurrentProcess()->HasSwitch(
192 views::switches::kDesktopAura))
192 return new views::DesktopNativeWidgetAura(delegate); 193 return new views::DesktopNativeWidgetAura(delegate);
193 #endif 194 #endif
194 return NULL; 195 return NULL;
195 } 196 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698