diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 22:33:20 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 22:33:20 +0000 |
| commit | 5a484224887687a7d46d9aa0094c544b6e4518a8 (patch) | |
| tree | 4bcd36d1b008c533f0202ae4785571e092cd10d8 /chrome/browser/views | |
| parent | a11f3c718777c924e449e9846f3dd9cea13250c9 (diff) | |
| download | chromium_src-5a484224887687a7d46d9aa0094c544b6e4518a8.zip chromium_src-5a484224887687a7d46d9aa0094c544b6e4518a8.tar.gz chromium_src-5a484224887687a7d46d9aa0094c544b6e4518a8.tar.bz2 | |
Cloud Print Proxy UI crash fix.
Better handle the case where the profile may not have a CloudPrintProxyService
hanging off of the profile.
BUG=60818
TEST=Set the tabbed settings lab, restart, new incognito window, bring up the settings. Should not fall down and go boom.
Review URL: http://codereview.chromium.org/4137006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/options/advanced_contents_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index ba3f426..b8513b6 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -1674,7 +1674,8 @@ void AdvancedContentsView::InitControlLayout() { layout->StartRow(0, single_column_view_set_id); layout->AddView(new SecuritySection(profile())); if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCloudPrintProxy)) { + switches::kEnableCloudPrintProxy) && + profile()->GetCloudPrintProxyService()) { layout->StartRow(0, single_column_view_set_id); layout->AddView(new CloudPrintProxySection(profile())); } |