diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
| commit | b689fce776a394377fed51ae063942509a2988a1 (patch) | |
| tree | eb52e9944db424e9e1b80bcefe9b9b96b1c27b50 /chrome/browser/views | |
| parent | 84ae20cba3059760948ca5d1f313dc25c74b26d6 (diff) | |
| download | chromium_src-b689fce776a394377fed51ae063942509a2988a1.zip chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.gz chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.bz2 | |
Merge DOMUIContents into WebContents.
I did a lot of cleanup of the DOM UI system as part of this.
Review URL: http://codereview.chromium.org/42227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/options/general_page_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index a1abb9b..af3e9bd 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -28,6 +28,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" +#include "chrome/common/url_constants.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/button/radio_button.h" #include "chrome/views/controls/label.h" @@ -39,14 +40,15 @@ #include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" +namespace { + 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(NewTabUI::GetBaseURL().spec()); + return UTF8ToWide(chrome::kChromeUINewTabURL); } } |