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

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/speech/speech_input_bubble_views.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/speech_input_bubble_gtk.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 <algorithm>	7 #include <algorithm>

8	8

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

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

11 #include "chrome/browser/ui/views/frame/browser_view.h"	11 #include "chrome/browser/ui/views/frame/browser_view.h"

12 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"	12 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"

13 #include "chrome/browser/ui/views/toolbar_view.h"	13 #include "chrome/browser/ui/views/toolbar_view.h"

14 #include "chrome/browser/ui/views/window.h"	14 #include "chrome/browser/ui/views/window.h"

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

16 #include "content/browser/speech/speech_input_manager.h"	15 #include "content/browser/speech/speech_input_manager.h"

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

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

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

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

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

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

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

23 #include "ui/views/bubble/bubble_delegate.h"	23 #include "ui/views/bubble/bubble_delegate.h"

24 #include "ui/views/controls/button/text_button.h"	24 #include "ui/views/controls/button/text_button.h"

25 #include "ui/views/controls/image_view.h"	25 #include "ui/views/controls/image_view.h"

26 #include "ui/views/controls/label.h"	26 #include "ui/views/controls/label.h"

(...skipping 353 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
380 }	380 }

381	381

382 } // namespace	382 } // namespace

383	383

384 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(	384 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(

385 WebContents* web_contents,	385 WebContents* web_contents,

386 SpeechInputBubble::Delegate* delegate,	386 SpeechInputBubble::Delegate* delegate,

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

388 return new SpeechInputBubbleImpl(web_contents, delegate, element_rect);	388 return new SpeechInputBubbleImpl(web_contents, delegate, element_rect);

389 }	389 }

OLD	NEW