summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 19:41:32 +0000
committerctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 19:41:32 +0000
commit250c2074c440088f044fe392178b245c41f8b71e (patch)
treed64d7b20a83fe6ce8e9e2eb0795d63a678cc7f26
parentf408c28ff4586edcdd70367c82aeccf2d30ce9c3 (diff)
downloadchromium_src-250c2074c440088f044fe392178b245c41f8b71e.zip
chromium_src-250c2074c440088f044fe392178b245c41f8b71e.tar.gz
chromium_src-250c2074c440088f044fe392178b245c41f8b71e.tar.bz2
Initialize most_recent_profile_ in constructor.
BUG=51631 TEST=Ensure chrome --first-run don't crash when opening the wrench menu. Review URL: http://codereview.chromium.org/3139002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55606 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/accessibility_event_router_views.cc3
-rw-r--r--views/controls/menu/submenu_view.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/accessibility_event_router_views.cc b/chrome/browser/views/accessibility_event_router_views.cc
index 670e2f0..4f2d7ff 100644
--- a/chrome/browser/views/accessibility_event_router_views.cc
+++ b/chrome/browser/views/accessibility_event_router_views.cc
@@ -23,7 +23,8 @@ using views::FocusManager;
using views::View;
AccessibilityEventRouterViews::AccessibilityEventRouterViews()
- : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+ : most_recent_profile_(NULL),
+ ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
}
AccessibilityEventRouterViews::~AccessibilityEventRouterViews() {
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 2cfd8b8..ba40933 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -241,7 +241,7 @@ void SubmenuView::ShowAt(gfx::NativeWindow parent,
host_->Init(parent, bounds, scroll_view_container_, do_capture);
GetScrollViewContainer()->NotifyAccessibilityEvent(
- AccessibilityTypes::EVENT_MENUPOPUPSTART);
+ AccessibilityTypes::EVENT_MENUPOPUPSTART);
}
void SubmenuView::Reposition(const gfx::Rect& bounds) {