chrome/browser/speech/speech_input_bubble_gtk.cc - Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ...

Side by Side Diff: chrome/browser/speech/speech_input_bubble_gtk.cc

Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/speech/chrome_speech_input_manager.cc ('k') | chrome/browser/speech/speech_input_bubble_views.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/speech/speech_input_bubble.h"	5 #include "chrome/browser/speech/speech_input_bubble.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"	10 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"

11 #include "chrome/browser/ui/gtk/browser_window_gtk.h"	11 #include "chrome/browser/ui/gtk/browser_window_gtk.h"

12 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"	12 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"

13 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"	13 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"

14 #include "chrome/browser/ui/gtk/gtk_theme_service.h"	14 #include "chrome/browser/ui/gtk/gtk_theme_service.h"

15 #include "chrome/browser/ui/gtk/gtk_util.h"	15 #include "chrome/browser/ui/gtk/gtk_util.h"

16 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"	16 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"

17 #include "content/browser/resource_context.h"

18 #include "content/browser/speech/speech_input_manager.h"	17 #include "content/browser/speech/speech_input_manager.h"

	18 #include "content/public/browser/resource_context.h"

19 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "grit/theme_resources.h"	21 #include "grit/theme_resources.h"

22 #include "media/audio/audio_manager.h"	22 #include "media/audio/audio_manager.h"

23 #include "ui/base/gtk/gtk_hig_constants.h"	23 #include "ui/base/gtk/gtk_hig_constants.h"

24 #include "ui/base/gtk/owned_widget_gtk.h"	24 #include "ui/base/gtk/owned_widget_gtk.h"

25 #include "ui/base/l10n/l10n_util.h"	25 #include "ui/base/l10n/l10n_util.h"

26 #include "ui/base/resource/resource_bundle.h"	26 #include "ui/base/resource/resource_bundle.h"

27 #include "ui/gfx/gtk_util.h"	27 #include "ui/gfx/gtk_util.h"

28 #include "ui/gfx/rect.h"	28 #include "ui/gfx/rect.h"

(...skipping 264 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
293 }	293 }

294	294

295 } // namespace	295 } // namespace

296	296

297 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(	297 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(

298 WebContents* web_contents,	298 WebContents* web_contents,

299 Delegate* delegate,	299 Delegate* delegate,

300 const gfx::Rect& element_rect) {	300 const gfx::Rect& element_rect) {

301 return new SpeechInputBubbleGtk(web_contents, delegate, element_rect);	301 return new SpeechInputBubbleGtk(web_contents, delegate, element_rect);

302 }	302 }

OLD	NEW