SelectAll when activating the omni box via touch. Regular (short) touch should now work the same wa…

chrome/browser/ui/views/omnibox/omnibox_view_win.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/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 40 matching lines @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/menu/menu_2.h"
 #include "ui/views/controls/textfield/native_textfield_win.h"
 #include "ui/views/widget/widget.h"
 
+// TODO(tommi): Remove this when we update to a newer SDK.

[Peter Kasting, 2012/05/16 18:30:16]

Just curious: Is there a bug or specific plan on updating to a newer SDK?  It'd
be nice to do that soon so these sorts of blobs don't proliferate.

[tommi (sloooow) - chröme, 2012/05/16 19:11:08]

I don't know if there is a bug filed, but we're already starting to look into
the latest platform sdk (8) so I think that will happen regardless.  Hmm...
maybe I should keep this in the header where there's another similar check, just
to keep the number of blobs down?

[Peter Kasting, 2012/05/16 19:12:34]

That'd be fine.  Whatever you think is best.

I mostly just want to make sure that we don't lose track of any of these blobs,
so they don't live any longer than they have to.

+#ifndef POINTER_MESSAGE_FLAG_FIRSTBUTTON
+#define POINTER_MESSAGE_FLAG_FIRSTBUTTON 0x00000010 // Primary action
+#define IS_POINTER_FLAG_SET_WPARAM(wParam, flag) \
+    (((DWORD)HIWORD(wParam) & (flag)) == (flag))
+#define IS_POINTER_FIRSTBUTTON_WPARAM(wParam) \
+    IS_POINTER_FLAG_SET_WPARAM(wParam, POINTER_MESSAGE_FLAG_FIRSTBUTTON)
+#endif
+
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
 using content::UserMetricsAction;
 using content::WebContents;
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel
 
 namespace {
@@ skipping 1369 matching lines @@
     default:
       break;
   }
   return DefWindowProc(message, wparam, lparam);
 }
 
 LRESULT OmniboxViewWin::OnPointerDown(UINT message,
                                       WPARAM wparam,
                                       LPARAM lparam) {
   SetFocus();
+
+  if (IS_POINTER_FIRSTBUTTON_WPARAM(wparam)) {
+    TrackMousePosition(kLeft, CPoint(GET_X_LPARAM(lparam),
+                                     GET_Y_LPARAM(lparam)));
+  }
+
   // ITextInputPanel is not supported on all platforms.  NULL is fine.
   if (keyboard_ != NULL)
     keyboard_->SetInPlaceVisibility(true);
   return DefWindowProc(message, wparam, lparam);
 }
 
 void OmniboxViewWin::OnKeyDown(TCHAR key,
                                UINT repeat_count,
                                UINT flags) {
   delete_at_end_pressed_ = false;
@@ skipping 196 matching lines @@
   // First, give other handlers a chance to handle the message to see if we are
   // actually going to activate and gain focus.
   LRESULT result = DefWindowProc(WM_MOUSEACTIVATE,
                                  reinterpret_cast<WPARAM>(window),
                                  MAKELPARAM(hit_test, mouse_message));
   // Check if we're getting focus from a click.  We have to do this here rather
   // than in OnXButtonDown() since in many scenarios OnSetFocus() will be
   // reached before OnXButtonDown(), preventing us from detecting this properly
   // there.  Also in those cases, we need to already know in OnSetFocus() that
   // we should not restore the saved selection.
-  if (!model_->has_focus() &&
-      ((mouse_message == WM_LBUTTONDOWN || mouse_message == WM_RBUTTONDOWN)) &&
-      (result == MA_ACTIVATE)) {
+  if (result == MA_ACTIVATE &&

[Peter Kasting, 2012/05/16 18:30:16]

Nit: For consistency with the rest of this file, keep each binary-op expr in
parens.

Any particular reason to reverse the condition ordering?  Both seem about the
same to me.

[tommi (sloooow) - chröme, 2012/05/16 19:11:08]

Done
No reason. They got shifted around while debugging.
I switched them back for a simpler diff.

+      (mouse_message == WM_LBUTTONDOWN || mouse_message == WM_RBUTTONDOWN ||
+       mouse_message == WM_POINTERDOWN) &&
+      !model_->has_focus()) {
     DCHECK(!gaining_focus_.get());
     gaining_focus_.reset(new ScopedFreeze(this, GetTextObjectModel()));
     // NOTE: Despite |mouse_message| being WM_XBUTTONDOWN here, we're not
     // guaranteed to call OnXButtonDown() later!  Specifically, if this is the
     // second click of a double click, we'll reach here but later call
     // OnXButtonDblClk().  Make sure |gaining_focus_| gets reset both places,
     // or we'll have visual glitchiness and then DCHECK failures.
 
     // Don't restore saved selection, it will just screw up our interaction
     // with this edit.
@@ skipping 997 matching lines @@
     bool popup_window_mode,
     LocationBarView* location_bar) {
   return new OmniboxViewWin(controller,
                             toolbar_model,
                             location_bar,
                             command_updater,
                             popup_window_mode,
                             location_bar);
 }
 #endif