| Index: chrome/browser/ui/views/frame/browser_frame.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/frame/browser_frame.cc (revision 114849)
|
| +++ chrome/browser/ui/views/frame/browser_frame.cc (working copy)
|
| @@ -25,7 +25,7 @@
|
| #endif
|
|
|
| #if defined(USE_AURA)
|
| -#include "ui/aura/aura_switches.h"
|
| +#include "ui/aura_shell/aura_shell_switches.h"
|
| #endif
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -66,10 +66,10 @@
|
| }
|
| #if defined(USE_AURA)
|
| CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| - if (command_line->HasSwitch(switches::kAuraTranslucentFrames))
|
| + if (command_line->HasSwitch(aura_shell::switches::kAuraTranslucentFrames))
|
| params.transparent = true;
|
| // Aura laptop mode fills the monitor with with its windows.
|
| - if (command_line->HasSwitch(switches::kAuraLaptopMode) &&
|
| + if (command_line->HasSwitch(aura_shell::switches::kAuraLaptopMode) &&
|
| browser_view_->IsBrowserTypeNormal()) {
|
| params.bounds = gfx::Screen::GetPrimaryMonitorBounds();
|
| params.show_state = ui::SHOW_STATE_MAXIMIZED;
|
| @@ -82,7 +82,8 @@
|
| bool disable_inactive_rendering = false;
|
| #if defined(USE_AURA)
|
| disable_inactive_rendering =
|
| - CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraLaptopMode);
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + aura_shell::switches::kAuraLaptopMode);
|
| #elif defined(OS_CHROMEOS)
|
| disable_inactive_rendering = true;
|
| #endif
|
| @@ -123,7 +124,8 @@
|
| bool single_window_mode = false;
|
| #if defined(USE_AURA)
|
| single_window_mode =
|
| - CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraLaptopMode);
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + aura_shell::switches::kAuraLaptopMode);
|
| #elif defined(OS_CHROMEOS)
|
| single_window_mode =
|
| chromeos::system::runtime_environment::IsRunningOnChromeOS();
|
|
|