diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 17:47:58 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 17:47:58 +0000 |
| commit | 9e4c033c4f88780c47ebf13ab4b9f180bf63df29 (patch) | |
| tree | dcea8183f667edf646f7584064a2ca86af573471 /chrome/browser/views | |
| parent | d7e85c5dd9c2c8dfb38d1e7c6aacb1c3bd0bf590 (diff) | |
| download | chromium_src-9e4c033c4f88780c47ebf13ab4b9f180bf63df29.zip chromium_src-9e4c033c4f88780c47ebf13ab4b9f180bf63df29.tar.gz chromium_src-9e4c033c4f88780c47ebf13ab4b9f180bf63df29.tar.bz2 | |
Enable history and downloads by default, port NewTabUI from DOMUIHost to DOMUI.
NewTabUI is only included on OS(WIN) because DOMUI doesn't appear to have been ported.
Review URL: http://codereview.chromium.org/28104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/download_shelf_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/options/general_page_view.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index b3bacde..ffcb3cd 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -265,7 +265,7 @@ void DownloadShelfView::LinkActivated(views::Link* source, int event_flags) { NavigationController* controller = tab_contents_->controller(); Browser* browser = Browser::GetBrowserForController(controller, &index); DCHECK(browser); - browser->ShowNativeUITab(DownloadTabUI::GetURL()); + browser->ShowDownloadsTab(); } void DownloadShelfView::ButtonPressed(views::BaseButton* button) { diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 2d66925..c614950 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -22,6 +22,7 @@ #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" @@ -45,7 +46,7 @@ static const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0); namespace { std::wstring GetNewTabUIURLString() { - return UTF8ToWide(NewTabUIURL().spec()); + return UTF8ToWide(NewTabUI::GetBaseURL().spec()); } } |