| Index: chrome/browser/dom_ui/dom_ui_factory.cc
|
| ===================================================================
|
| --- chrome/browser/dom_ui/dom_ui_factory.cc (revision 49931)
|
| +++ chrome/browser/dom_ui/dom_ui_factory.cc (working copy)
|
| @@ -8,10 +8,8 @@
|
| #include "chrome/browser/dom_ui/bookmarks_ui.h"
|
| #include "chrome/browser/dom_ui/downloads_ui.h"
|
| #include "chrome/browser/dom_ui/devtools_ui.h"
|
| -#include "chrome/browser/dom_ui/filebrowse_ui.h"
|
| #include "chrome/browser/dom_ui/history_ui.h"
|
| #include "chrome/browser/dom_ui/html_dialog_ui.h"
|
| -#include "chrome/browser/dom_ui/mediaplayer_ui.h"
|
| #include "chrome/browser/dom_ui/net_internals_ui.h"
|
| #include "chrome/browser/dom_ui/new_tab_ui.h"
|
| #include "chrome/browser/dom_ui/plugins_ui.h"
|
| @@ -24,6 +22,12 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chrome/browser/dom_ui/filebrowse_ui.h"
|
| +#include "chrome/browser/dom_ui/mediaplayer_ui.h"
|
| +#include "chrome/browser/dom_ui/options_ui.h"
|
| +#endif
|
| +
|
| const DOMUITypeID DOMUIFactory::kNoDOMUI = NULL;
|
|
|
| // A function for creating a new DOMUI. The caller owns the return value, which
|
| @@ -106,9 +110,10 @@
|
| #if defined(OS_CHROMEOS)
|
| if (url.host() == chrome::kChromeUIFileBrowseHost)
|
| return &NewDOMUI<FileBrowseUI>;
|
| -
|
| if (url.host() == chrome::kChromeUIMediaplayerHost)
|
| return &NewDOMUI<MediaplayerUI>;
|
| + if (url.host() == chrome::kChromeUIOptionsHost)
|
| + return &NewDOMUI<OptionsUI>;
|
| #endif
|
|
|
| return NULL;
|
|
|