diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 18:08:16 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 18:08:16 +0000 |
| commit | ca38d8e05b6cbd729487c6ed619117ae7510e4c6 (patch) | |
| tree | 7eb25a06ec77a3d590bcbe85a690d3e84a9e6bd8 /chrome/browser/dom_ui | |
| parent | a8c72ad420e48ee14106cc61340a3ce6064a3c2d (diff) | |
| download | chromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.zip chromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.tar.gz chromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.tar.bz2 | |
Remove personalization.h/cc by putting things in final resting places
Review URL: http://codereview.chromium.org/173085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_factory.cc | 17 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_page_sync_handler.cc | 1 |
2 files changed, 6 insertions, 12 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc index af214c6..8b5a1c2 100644 --- a/chrome/browser/dom_ui/dom_ui_factory.cc +++ b/chrome/browser/dom_ui/dom_ui_factory.cc @@ -16,9 +16,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" -#ifdef CHROME_PERSONALIZATION -#include "chrome/browser/sync/personalization.h" -#endif #include "googleurl/src/gurl.h" // Backend for both querying for and creating new DOMUI objects. If you're just @@ -67,20 +64,18 @@ static bool CreateDOMUI(const GURL& url, TabContents* tab_contents, } #endif -#ifdef CHROME_PERSONALIZATION - if (Personalization::NeedsDOMUI(url)) { - if (new_ui) - *new_ui = new HtmlDialogUI(tab_contents); - return true; - } -#endif - // This will get called a lot to check all URLs, so do a quick check of other // schemes (gears was handled above) to filter out most URLs. if (!url.SchemeIs(chrome::kChromeInternalScheme) && !url.SchemeIs(chrome::kChromeUIScheme)) return false; + if (url.host() == chrome::kSyncResourcesHost) { + if (new_ui) + *new_ui = new HtmlDialogUI(tab_contents); + return true; + } + // Special case the new tab page. In older versions of Chrome, the new tab // page was hosted at chrome-internal:<blah>. This might be in people's saved // sessions or bookmarks, so we say any URL with that scheme triggers the new diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index d903f28..7b8fd39 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -11,7 +11,6 @@ #include "base/values.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/sync/personalization.h" #include "chrome/browser/sync/personalization_strings.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" |