summaryrefslogtreecommitdiffstats
path: root/chrome/browser/custom_home_pages_table_model.h
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 04:04:19 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 04:04:19 +0000
commit9d52ae60b8137343f10a7ecbd9d39b6aca8c8a50 (patch)
tree687301d54aa758fd259c44565fa4eb9810c72658 /chrome/browser/custom_home_pages_table_model.h
parent34bfcda415e35e387f31fc642df97937ef46ae21 (diff)
downloadchromium_src-9d52ae60b8137343f10a7ecbd9d39b6aca8c8a50.zip
chromium_src-9d52ae60b8137343f10a7ecbd9d39b6aca8c8a50.tar.gz
chromium_src-9d52ae60b8137343f10a7ecbd9d39b6aca8c8a50.tar.bz2
Fixed crash on setting startup pages. See issue 7111010
R=atwilson@chromium.org BUG=none TEST=Manually add startup pages in browser settings, using debug build. Should not crash any more Review URL: http://codereview.chromium.org/7216001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_home_pages_table_model.h')
-rw-r--r--chrome/browser/custom_home_pages_table_model.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/custom_home_pages_table_model.h b/chrome/browser/custom_home_pages_table_model.h
index 0403d8d..a7ffb9e 100644
--- a/chrome/browser/custom_home_pages_table_model.h
+++ b/chrome/browser/custom_home_pages_table_model.h
@@ -99,7 +99,8 @@ class CustomHomePagesTableModel : public ui::TableModel {
ui::TableModelObserver* observer_;
// Used in loading titles and favicons.
- CancelableRequestConsumer query_consumer_;
+ CancelableRequestConsumer history_query_consumer_;
+ CancelableRequestConsumer favicon_query_consumer_;
DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
};