diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 21:09:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 21:09:24 +0000 |
| commit | 0ec4898e0384bdcd499a9fb27d66d7e226788cef (patch) | |
| tree | a155f8f483d01f87ec4e366bbbd836dfbe2641fa /chrome/browser/ui/webui/conflicts_ui.cc | |
| parent | af3594e07f3b8e43c547d5bab900cd15b23b0208 (diff) | |
| download | chromium_src-0ec4898e0384bdcd499a9fb27d66d7e226788cef.zip chromium_src-0ec4898e0384bdcd499a9fb27d66d7e226788cef.tar.gz chromium_src-0ec4898e0384bdcd499a9fb27d66d7e226788cef.tar.bz2 | |
Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h instead of tab_contents.h. In a few cases some of these files used functions that needed a TabContents, so I switched them as well.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9003014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/conflicts_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/conflicts_ui.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index 1647e5a..29b6337 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -19,11 +19,11 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -33,6 +33,7 @@ #include "ui/base/resource/resource_bundle.h" using content::UserMetricsAction; +using content::WebContents; namespace { @@ -156,7 +157,7 @@ void ConflictsDOMHandler::Observe(int type, // /////////////////////////////////////////////////////////////////////////////// -ConflictsUI::ConflictsUI(TabContents* contents) : ChromeWebUI(contents) { +ConflictsUI::ConflictsUI(WebContents* contents) : ChromeWebUI(contents) { content::RecordAction(UserMetricsAction("ViewAboutConflicts")); AddMessageHandler(new ConflictsDOMHandler()); |