Made launcher hidden when kicking off chrome in app mode.

chrome/browser/ui/fullscreen/fullscreen_controller.cc

 // Copyright (c) 2012 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/fullscreen/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/switch_utils.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_MACOSX)
@@ skipping 342 matching lines @@
   else if (mouse_lock_tab_)
     return mouse_lock_tab_->GetURL();
   else if (!extension_caused_fullscreen_.is_empty())
     return extension_caused_fullscreen_;
   else
     return GURL();
 }
 
 FullscreenExitBubbleType FullscreenController::GetFullscreenExitBubbleType()
     const {
-  // In kiosk mode we always want to be fullscreen and do not want to show
-  // exit instructions for browser mode fullscreen.
-  bool kiosk = false;
-#if !defined(OS_MACOSX)  // Kiosk mode not available on Mac.
-  kiosk = CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
+  // In kiosk and exclusive app mode we always want to be fullscreen and do not
+  // want to show exit instructions for browser mode fullscreen.
+  bool app_mode = false;
+#if !defined(OS_MACOSX)  // App mode (kiosk) is not available on Mac yet.
+  app_mode = switches::IsRunningInAppMode();
 #endif
 
   if (mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY) {
     return FEB_TYPE_NONE;
   }
 
   if (fullscreened_tab_) {
     if (tab_fullscreen_accepted_) {
       if (IsMouseLocked()) {
         return FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION;
@@ skipping 10 matching lines @@
       }
     }
   } else {  // Not tab full screen.
     if (IsMouseLocked()) {
       return FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION;
     } else if (IsMouseLockRequested()) {
       return FEB_TYPE_MOUSELOCK_BUTTONS;
     } else {
       if (!extension_caused_fullscreen_.is_empty()) {
         return FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION;
-      } else if (toggled_into_fullscreen_ && !kiosk) {
+      } else if (toggled_into_fullscreen_ && !app_mode) {
         return FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION;
       } else {
         return FEB_TYPE_NONE;
       }
     }
   }
   NOTREACHED();
   return FEB_TYPE_NONE;
 }
 
@@ skipping 73 matching lines @@
   if (!IsFullscreenForTabOrPending()) {
     if (option == BROWSER_WITH_CHROME)
       enter_fullscreen |= window_->IsFullscreenWithoutChrome();
     else
       enter_fullscreen |= window_->IsFullscreenWithChrome();
   }
 #endif
 
   // In kiosk mode, we always want to be fullscreen. When the browser first
   // starts we're not yet fullscreen, so let the initial toggle go through.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
-      window_->IsFullscreen())
+  if (switches::IsRunningInAppMode() && window_->IsFullscreen())
     return;
 
   if (enter_fullscreen)
     EnterFullscreenModeInternal(option);
   else
     ExitFullscreenModeInternal();
 }
 
 void FullscreenController::EnterFullscreenModeInternal(
     FullscreenInternalOption option) {
@@ skipping 86 matching lines @@
 
 ContentSetting
 FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }