| 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/frame/browser_frame_aura.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_aura.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 10 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" | 10 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } | 187 } |
| 188 | 188 |
| 189 //////////////////////////////////////////////////////////////////////////////// | 189 //////////////////////////////////////////////////////////////////////////////// |
| 190 // NativeBrowserFrame, public: | 190 // NativeBrowserFrame, public: |
| 191 | 191 |
| 192 // static | 192 // static |
| 193 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 193 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
| 194 BrowserFrame* browser_frame, | 194 BrowserFrame* browser_frame, |
| 195 BrowserView* browser_view) { | 195 BrowserView* browser_view) { |
| 196 #if !defined(OS_CHROMEOS) | 196 #if !defined(OS_CHROMEOS) |
| 197 if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura)) | 197 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 198 views::switches::kDesktopAura)) |
| 198 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 199 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
| 199 #endif | 200 #endif |
| 200 return new BrowserFrameAura(browser_frame, browser_view); | 201 return new BrowserFrameAura(browser_frame, browser_view); |
| 201 } | 202 } |
| 202 | 203 |
| 203 /////////////////////////////////////////////////////////////////////////////// | 204 /////////////////////////////////////////////////////////////////////////////// |
| 204 // BrowserFrameAura, private: | 205 // BrowserFrameAura, private: |
| 205 | 206 |
| 206 BrowserFrameAura::~BrowserFrameAura() { | 207 BrowserFrameAura::~BrowserFrameAura() { |
| 207 } | 208 } |
| OLD | NEW |