Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1611)

Side by Side Diff: content/shell/shell_content_browser_client.h

Issue 9568002: Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased from master. Created 8 years, 9 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
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 int notification_id) OVERRIDE; 139 int notification_id) OVERRIDE;
140 virtual bool CanCreateWindow( 140 virtual bool CanCreateWindow(
141 const GURL& opener_url, 141 const GURL& opener_url,
142 const GURL& origin, 142 const GURL& origin,
143 WindowContainerType container_type, 143 WindowContainerType container_type,
144 content::ResourceContext* context, 144 content::ResourceContext* context,
145 int render_process_id) OVERRIDE; 145 int render_process_id) OVERRIDE;
146 virtual std::string GetWorkerProcessTitle( 146 virtual std::string GetWorkerProcessTitle(
147 const GURL& url, content::ResourceContext* context) OVERRIDE; 147 const GURL& url, content::ResourceContext* context) OVERRIDE;
148 virtual void ResourceDispatcherHostCreated() OVERRIDE; 148 virtual void ResourceDispatcherHostCreated() OVERRIDE;
149 virtual SpeechInputManagerDelegate* GetSpeechInputManagerDelegate() OVERRIDE; 149 virtual SpeechRecognitionManagerDelegate*
150 GetSpeechRecognitionManagerDelegate() OVERRIDE;
150 virtual ui::Clipboard* GetClipboard() OVERRIDE; 151 virtual ui::Clipboard* GetClipboard() OVERRIDE;
151 virtual net::NetLog* GetNetLog() OVERRIDE; 152 virtual net::NetLog* GetNetLog() OVERRIDE;
152 virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE; 153 virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
153 virtual bool IsFastShutdownPossible() OVERRIDE; 154 virtual bool IsFastShutdownPossible() OVERRIDE;
154 virtual void OverrideWebkitPrefs(RenderViewHost* rvh, 155 virtual void OverrideWebkitPrefs(RenderViewHost* rvh,
155 const GURL& url, 156 const GURL& url,
156 WebPreferences* prefs) OVERRIDE; 157 WebPreferences* prefs) OVERRIDE;
157 virtual void UpdateInspectorSetting(RenderViewHost* rvh, 158 virtual void UpdateInspectorSetting(RenderViewHost* rvh,
158 const std::string& key, 159 const std::string& key,
159 const std::string& value) OVERRIDE; 160 const std::string& value) OVERRIDE;
(...skipping 20 matching lines...) Expand all
180 const GURL& url) OVERRIDE; 181 const GURL& url) OVERRIDE;
181 #endif 182 #endif
182 183
183 private: 184 private:
184 ShellBrowserMainParts* shell_browser_main_parts_; 185 ShellBrowserMainParts* shell_browser_main_parts_;
185 }; 186 };
186 187
187 } // namespace content 188 } // namespace content
188 189
189 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ 190 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698