Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

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 1724 matching lines @@
   // 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 (gaining_focus_) {
       // On Windows 8 in metro mode, we get two WM_MOUSEACTIVATE messages when
       // we click on the omnibox with the mouse.
-      DCHECK(base::win::IsMetroProcess());
+      DCHECK(win8::IsSingleWindowMetroMode());

[cpu_(ooo_6.6-7.5), 2012/12/03 20:56:26]

not familiar with this change, again consider this for a second CL.

[gab, 2012/12/04 00:19:06]

This was added by ananta in https://codereview.chromium.org/11098077, I don't
think this code path is even used in an AURA build (does the AURA build  use
omnibox_view_win.cc?) and even if it does, I don't think we would be subject to
this bad behavior?

In doubt I can leave this out, but I'd rather keep it all together.

[cpu_(ooo_6.6-7.5), 2012/12/04 01:17:39]

Like I said, all other things equal you should prefer smaller CLs, but if you
insists then add ananta to the review.

On 2012/12/04 00:19:06, gab wrote:

[gab, 2012/12/04 18:47:42]

Ok, leaving out for now.

[gab, 2012/12/04 19:04:31]

Reconsidered, leaving it in since this file isn't even compiled in on AURA so
this is definitely the right choice:
https://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/chrome_browser_ui.....

       return result;
     }
     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
@@ skipping 990 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }