crbug.com/127841 - Request Tablet Site on CB with touch screen.

chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/metro_pin_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "content/public/browser/host_zoom_map.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/base/touch/touch_factory.h"
+#endif
+
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
@@ skipping 284 matching lines @@
     content::RecordAction(UserMetricsAction("ShowHelpTabViaWrenchMenu"));
 
   chrome::ExecuteCommand(browser_, command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdChecked(int command_id) const {
   if (command_id == IDC_SHOW_BOOKMARK_BAR) {
     return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   } else if (command_id == IDC_PROFILING_ENABLED) {
     return Profiling::BeingProfiled();
+  } else if (command_id == IDC_TOGGLE_REQUEST_TABLET_SITE) {
+    WebContents* current_tab = chrome::GetActiveWebContents(browser_);

[sky, 2012/09/07 18:05:30]

Move this logic into a function, IsRequestingTabletSite, maybe right next to the
other functions in browser_commands.

[sschmitz, 2012/09/07 22:33:09]

Done.

+    if (!current_tab)
+      return false;
+    content::NavigationEntry* entry =
+        current_tab->GetController().GetActiveEntry();
+    if (!entry)
+      return false;
+    return entry->GetIsOverridingUserAgent();
   }
 
   return false;
 }
 
 bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
   GlobalError* error = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetGlobalErrorByMenuItemCommandID(command_id);
   if (error)
     return true;
@@ skipping 151 matching lines @@
 
   if (browser_defaults::kShowSyncSetupMenuItem &&
       browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
     const string16 short_product_name =
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
     AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
         IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name));
     AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
-  AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
+  AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);\

[sky, 2012/09/07 18:05:30]

WHy the \ ?

[sschmitz, 2012/09/07 22:33:09]

Oops, removed. Done.

+
+#if defined(OS_CHROMEOS)
+  //  Note: on Chromebooks with default to "Desktop Site" even for

[sky, 2012/09/07 18:05:30]

Again, how come we don't have one in about:flags ?

[sschmitz, 2012/09/07 22:33:09]

Removed one flag, removed the "and is-touch-device" requirement, added remaining
flag to about:flags.

+  //        Chromebooks with a touch screen.
+  //        The following toggle lets the user switch to
+  //        "Tablet Site". This functionality is under two flags:
+  //          - to turn in on only for touch devices (intended use)
+  //          - to turn it on regardless of touch device (for testing)
+  bool enable_flag = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableRequestTabletSite);
+  bool force_flag = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableRequestTabletSiteEvenIfNonTouchDevice);
+  if (force_flag ||
+      (enable_flag && ui::TouchFactory::GetInstance()->IsTouchDevicePresent()))
+    AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
+                             IDS_TOGGLE_REQUEST_TABLET_SITE);
+#endif
 
 // On ChromeOS-Touch, we don't want the about/background pages menu options.
 #if defined(OS_CHROMEOS)
   if (!is_new_menu)
 #endif
   {
     AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
     // We use the task manager to show background pages.
     if (chrome::CanOpenTaskManager()) {
       string16 num_background_pages = base::FormatNumber(
@@ skipping 139 matching lines @@
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(
       ProfileSyncServiceFactory::GetForProfile(profile),
       *SigninManagerFactory::GetForProfile(profile));
 }