diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 16:04:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 16:04:12 +0000 |
| commit | e7013f4c21d2f8c9da89c705760dae2498f38edd (patch) | |
| tree | 964a7df5cb8401e907be83e0696ff79cd0aed87b /chrome/browser/ui/webui/conflicts_ui.cc | |
| parent | 3abbed000fefd2f846da29a5c14683bf32ff1867 (diff) | |
| download | chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.zip chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.tar.gz chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.tar.bz2 | |
Removal of Profile from content part 5.
BUG=76788
TEST=no change visible
Review URL: http://codereview.chromium.org/7523054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94907 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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index a3d5296..4c1d3ea 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -157,7 +157,8 @@ ConflictsUI::ConflictsUI(TabContents* contents) : ChromeWebUI(contents) { AddMessageHandler((new ConflictsDOMHandler())->Attach(this)); // Set up the about:conflicts source. - contents->profile()->GetChromeURLDataManager()->AddDataSource( + Profile* profile = Profile::FromBrowserContext(contents->browser_context()); + profile->GetChromeURLDataManager()->AddDataSource( CreateConflictsUIHTMLSource()); } |