diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:55:30 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:55:30 +0000 |
| commit | 627e05130fa2d98498dbd19fdcae4a173801d797 (patch) | |
| tree | 6ab91bc7d842c689a509e897a09c5a789798ac17 /chrome/browser/speech | |
| parent | 632197304ce0bb8fa5cd8931fe90c3c19cdeeab8 (diff) | |
| download | chromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.zip chromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.tar.gz chromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.tar.bz2 | |
Rename TabContents::browser_context() to GetBrowserContext and put it into the WebContents interface.
BUG=98716
Review URL: http://codereview.chromium.org/9021022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
| -rw-r--r-- | chrome/browser/speech/speech_input_bubble_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/speech/speech_input_bubble_views.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_gtk.cc b/chrome/browser/speech/speech_input_bubble_gtk.cc index 842b558..471ca97 100644 --- a/chrome/browser/speech/speech_input_bubble_gtk.cc +++ b/chrome/browser/speech/speech_input_bubble_gtk.cc @@ -110,7 +110,7 @@ void SpeechInputBubbleGtk::OnTryAgainClicked(GtkWidget* widget) { void SpeechInputBubbleGtk::OnMicSettingsClicked(GtkWidget* widget) { speech_input::SpeechInputManager::ShowAudioInputSettingsFromUI( - &tab_contents()->browser_context()->GetResourceContext()); + &tab_contents()->GetBrowserContext()->GetResourceContext()); Hide(); } @@ -137,7 +137,7 @@ void SpeechInputBubbleGtk::Show() { kBubbleControlVerticalSpacing); Profile* profile = Profile::FromBrowserContext( - tab_contents()->browser_context()); + tab_contents()->GetBrowserContext()); // TODO(tommi): The audio_manager property can only be accessed from the // IO thread, so we can't call CanShowAudioInputSettings directly here if diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index e7714c9..ab71bf4 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -212,7 +212,7 @@ void SpeechInputBubbleView::ButtonPressed(views::Button* source, void SpeechInputBubbleView::LinkClicked(views::Link* source, int event_flags) { DCHECK_EQ(source, mic_settings_); speech_input::SpeechInputManager::ShowAudioInputSettingsFromUI( - &tab_contents_->browser_context()->GetResourceContext()); + &tab_contents_->GetBrowserContext()->GetResourceContext()); } gfx::Size SpeechInputBubbleView::GetPreferredSize() { @@ -342,7 +342,7 @@ void SpeechInputBubbleImpl::Show() { // Anchor to the location icon view, in case |element_rect| is offscreen. Profile* profile = - Profile::FromBrowserContext(tab_contents()->browser_context()); + Profile::FromBrowserContext(tab_contents()->GetBrowserContext()); Browser* browser = Browser::GetOrCreateTabbedBrowser(profile); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); views::View* icon = browser_view->GetLocationBarView() ? |