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 24 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/base/touch/touch_factory.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 #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"
@@ skipping 287 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) {
+    if (!browser_) return false;

[Rick Byers, 2012/08/03 15:53:06]

newline after if, here and elsewhere

[sschmitz, 2012/08/03 18:11:43]

Done.

+    content::WebContents* current_tab = chrome::GetActiveWebContents(browser_);
+    if (!current_tab) return false;
+    content::NavigationEntry *entry =
+        current_tab->GetController().GetActiveEntry();
+    if (!entry) return false;
+    return entry->GetIsOverridingUserAgent();

[Rick Byers, 2012/08/03 15:53:06]

Again, I think you want some independent state somewhere for this checkbox -
maybe just here in the WrenchMenuModel.  It needs to be updated from the
NavigationEntry on navigation (due to back/forward), but should be able to be
set true even when there is no current NavigationEntry (but needs to affect new
NavigationEntries).

[sschmitz, 2012/08/03 18:11:43]

Similar to browser_commands.cc, the control is disabled in this case and I added
a comment here to say so.
When the control is disabled the state is always "not checked". I hope that is
ok, because then we can keep the state in only one place (in the navigation
entry).
Done.

   }
 
   return false;
 }
 
 bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
   GlobalError* error = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetGlobalErrorByMenuItemCommandID(command_id);
   if (error)
     return true;
@@ skipping 124 matching lines @@
       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();
   }
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
 
+#if defined(OS_CHROMEOS)
+  //  Note: on Chromebooks with default to "Desktop Site" even for
+  //        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 enableFlag = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableRequestTabletSite);
+  bool forceFlag = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableRequestTabletSiteEvenIfNonTouchDevice);
+  if (forceFlag ||
+      (enableFlag && ui::TouchFactory::GetInstance()->IsTouchDevicePresent()))

[Rick Byers, 2012/08/03 15:53:06]

IsTouchDevicePresent is itself behind a flag (--enable-touch-events) which is
still off by default (expected to be turned on in M23).  If you like you can
eliminate your enableRequestTabletSite (relying implicitly just on
--enable-touch-events).  That'll save you the hassle of turning this flag on in
places where we're already testing our experimental touch screen support, and
save you from having to remove this flag later.

[sschmitz, 2012/08/03 18:11:43]

Question: Don't we want the added control to turn this feature (RTS) on/off
independently when --enable-touch-events is on?
So, for now I left it in.

+    AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
+                             IDS_TOGGLE_REQUEST_TABLET_SITE);
+#endif
+
   if (!is_touch_menu) {
     AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
     string16 num_background_pages = base::FormatNumber(
         TaskManager::GetBackgroundPageCount());
     AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
         IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
   }
 
   if (browser_defaults::kShowUpgradeMenuItem)
     AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
@@ skipping 121 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));
 }