Enable history and downloads by default, port NewTabUI from DOMUIHost to DOMU...

chrome/browser/views/options/general_page_view.cc

 // Copyright (c) 2006-2008 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/views/options/general_page_view.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/options/options_group_view.h"
 #include "chrome/browser/views/standard_layout.h"
+#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/label.h"
 #include "chrome/views/radio_button.h"
 #include "chrome/views/table_view.h"
 #include "chrome/views/text_field.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 
 static const int kStartupRadioGroup = 1;
 static const int kHomePageRadioGroup = 2;
 static const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0);
 static const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0);
 
 namespace {
 std::wstring GetNewTabUIURLString() {
-  return UTF8ToWide(NewTabUIURL().spec());
+  return UTF8ToWide(NewTabUI::GetBaseURL().spec());
 }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView::DefaultBrowserWorker
 //
 //  A helper object that handles checking if Chrome is the default browser on
 //  Windows and also setting it as the default browser. These operations are
 //  performed asynchronously on the file thread since registry access is
 //  involved and this can be slow.
@@ skipping 1021 matching lines @@
     homepage_use_url_textfield_->SetReadOnly(true);
   }
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->GetSelectedItem();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }