Changed ChromeOS status bar menu handlers to obey --enable-tabbed-options swi...

chrome/browser/gtk/first_run_bubble.cc

 // Copyright (c) 2010 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/gtk/first_run_bubble.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
+#include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/options_window.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 // Markup for the text of the Omnibox search label
 const char kSearchLabelMarkup[] = "<big><b>%s</b></big>";
@@ skipping 139 matching lines @@
   theme_provider_->InitThemesFor(this);
 }
 
 void FirstRunBubble::HandleDestroy(GtkWidget* sender) {
   content_ = NULL;
   delete this;
 }
 
 void FirstRunBubble::HandleKeepButton(GtkWidget* sender) {
   bubble_->Close();
+}
 
-}
 void FirstRunBubble::HandleChangeButton(GtkWidget* sender) {
   bubble_->Close();
-  ShowOptionsWindow(OPTIONS_PAGE_GENERAL, OPTIONS_GROUP_DEFAULT_SEARCH,
-                    profile_);
+  Browser* browser = BrowserList::GetLastActive();
+  DCHECK(browser);
+  browser->OpenSearchEngineOptionsDialog();
 }