Shell related switches -> aura shell switches.

chrome/browser/ui/views/frame/browser_frame.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/browser_root_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
 #if defined(USE_AURA)
-#include "ui/aura/aura_switches.h"
+#include "ui/aura_shell/aura_shell_switches.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
     : native_browser_frame_(NULL),
       root_view_(NULL),
       browser_frame_view_(NULL),
       browser_view_(browser_view) {
@@ skipping 20 matching lines @@
   }
   if (browser_view_->browser()->is_type_panel()) {
     // We need to set the top-most bit when the panel window is created.
     // There is a Windows bug/feature that would very likely prevent the window
     // from being changed to top-most after the window is created without
     // activation.
     params.keep_on_top = true;
   }
 #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;
   }
 #endif
   Init(params);
 
   // On ChromeOS and Aura laptop mode we always want top-level windows
   // to appear active.
   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
   if (disable_inactive_rendering && !browser_view_->IsBrowserTypePopup())
     DisableInactiveRendering();
 }
 
 int BrowserFrame::GetMinimizeButtonOffset() const {
   return native_browser_frame_->GetMinimizeButtonOffset();
 }
@@ skipping 20 matching lines @@
     GetRootView()->child_at(0)->InvalidateLayout();
   }
   GetRootView()->Layout();
   native_browser_frame_->TabStripDisplayModeChanged();
 }
 
 bool BrowserFrame::IsSingleWindowMode() const {
   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();
 #endif
   return single_window_mode;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, views::Widget overrides:
 
@@ skipping 45 matching lines @@
     // set ourselves as the last active browser window to ensure that we get
     // treated as such by the rest of Chrome.
     BrowserList::SetLastActive(browser_view_->browser());
   }
   Widget::OnNativeWidgetActivationChanged(active);
 }
 
 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
   return browser_frame_view_->avatar_button();
 }