From f4145d43019e7ba00c539e54ac7fb57944f17915 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 1 Jun 2009 22:26:59 +0000
Subject: Flip omnibox2 popup on by default for more testing.

Review URL: http://codereview.chromium.org/115980

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17363 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/autocomplete/autocomplete_popup_view_win.cc | 9 ++++-----
 chrome/common/chrome_switches.cc                           | 4 ++--
 chrome/common/chrome_switches.h                            | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'chrome')

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
index 8f97718..99da7ca 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
@@ -685,9 +685,8 @@ AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableOmnibox2)) {
-    return new AutocompletePopupContentsView(font, edit_view, edit_model,
-                                             profile, popup_positioner);
-  }
-  return new AutocompletePopupViewWin(font, edit_view, edit_model, profile);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableOmnibox2))
+    return new AutocompletePopupViewWin(font, edit_view, edit_model, profile);
+  return new AutocompletePopupContentsView(font, edit_view, edit_model,
+                                           profile, popup_positioner);
 }
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 622893e..a319b70 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -442,8 +442,8 @@ const wchar_t kAutoSpellCorrect[] = L"auto-spell-correct";
 
 // Enables StatsTable, logging statistics to a global named shared memory table.
 const wchar_t kEnableStatsTable[]              = L"enable-stats-table";
-// Enables the Omnibox2 popup and functionality.
-const wchar_t kEnableOmnibox2[]                = L"enable-omnibox2";
+// Disables the Omnibox2 popup and functionality.
+const wchar_t kDisableOmnibox2[]                = L"disable-omnibox2";
 
 // Replaces the audio IPC layer for <audio> and <video> with a mock audio
 // device, useful when using remote desktop or machines without sound cards.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5a5c6cb..955eafa 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -170,7 +170,7 @@ extern const wchar_t kEnableStatsTable[];
 
 extern const wchar_t kAutoSpellCorrect[];
 
-extern const wchar_t kEnableOmnibox2[];
+extern const wchar_t kDisableOmnibox2[];
 
 extern const wchar_t kDisableAudio[];
 extern const wchar_t kSimpleDataSource[];
-- 
cgit v1.1