diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 20:25:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 20:25:23 +0000 |
| commit | cb2edf23d2553c6e13d070a33f9f2b9613d21ab1 (patch) | |
| tree | 51c0b1125dba09b873d5f4bb6b63ae8c6ad35b17 /chrome/browser/speech | |
| parent | 6ba8fcd3ec74b24afb75821236de78677081ad29 (diff) | |
| download | chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.zip chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.tar.gz chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.tar.bz2 | |
Move the ViewType enum to extensions\common.
BUG=162530
Review URL: https://codereview.chromium.org/13375017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
| -rw-r--r-- | chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index 05b435d..b09d38f 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc @@ -17,7 +17,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" @@ -32,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" +#include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/l10n/l10n_util.h" @@ -501,15 +501,15 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType( } WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - chrome::ViewType view_type = chrome::GetViewType(web_contents); + extensions::ViewType view_type = extensions::GetViewType(web_contents); // TODO(kalman): Also enable speech bubble for extension popups // (VIEW_TYPE_EXTENSION_POPUP) once popup-like control UI works properly in // extensions: http://crbug.com/163851. // Right now the extension popup closes and dismisses immediately on user // click. - if (view_type == chrome::VIEW_TYPE_TAB_CONTENTS || - view_type == chrome::VIEW_TYPE_APP_SHELL) { + if (view_type == extensions::VIEW_TYPE_TAB_CONTENTS || + view_type == extensions::VIEW_TYPE_APP_SHELL) { // If it is a tab, we can show the speech input bubble or ask for // permission. |