summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 04:41:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 04:41:34 +0000
commit6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a (patch)
treee61a13869ded3789cfaa1d43f04f7aaa9b16abd4 /chrome/browser/speech
parent0c3bf9563dcd51310abbf9856db4aba416a664bf (diff)
downloadchromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.zip
chromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.tar.gz
chromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.tar.bz2
Final conversion step. Convert FocusManager, WidgetWin, SpeechInputBubble, and remove old functions now no-one uses them.
Continuation of: Land the new functions added by 76483 - but do not use them anywhere outside of their tests. This will help me incrementally re-deploy these functions and identify what is causing the buildbot test redness. BUG=72040 TEST=none TBR=sky (all code originally reviewed here: http://codereview.chromium.org/6598069/ ) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/speech_input_bubble_views.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc
index 17d81f5..e1906c2e 100644
--- a/chrome/browser/speech/speech_input_bubble_views.cc
+++ b/chrome/browser/speech/speech_input_bubble_views.cc
@@ -319,12 +319,11 @@ void SpeechInputBubbleImpl::Show() {
bubble_content_ = new ContentView(delegate_);
UpdateLayout();
- views::Widget* tab = views::Widget::GetWidgetFromNativeView(
- tab_contents()->view()->GetNativeView());
- views::Widget* parent = tab ? tab->GetRootWidget() : NULL;
-
- if (parent) {
- info_bubble_ = InfoBubble::Show(parent,
+ views::NativeWidget* toplevel_widget =
+ views::NativeWidget::GetTopLevelNativeWidget(
+ tab_contents()->view()->GetNativeView());
+ if (toplevel_widget) {
+ info_bubble_ = InfoBubble::Show(toplevel_widget->GetWidget(),
GetInfoBubbleTarget(element_rect_),
BubbleBorder::TOP_LEFT, bubble_content_,
this);