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

Side by Side Diff: chrome/browser/ui/app_list/app_list_view_delegate.h

Issue 69813002: Adds the speech recognition button to the app-list searchbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 1 month 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
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 CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 int event_flags) OVERRIDE; 73 int event_flags) OVERRIDE;
74 virtual void InvokeSearchResultAction(app_list::SearchResult* result, 74 virtual void InvokeSearchResultAction(app_list::SearchResult* result,
75 int action_index, 75 int action_index,
76 int event_flags) OVERRIDE; 76 int event_flags) OVERRIDE;
77 virtual void Dismiss() OVERRIDE; 77 virtual void Dismiss() OVERRIDE;
78 virtual void ViewClosing() OVERRIDE; 78 virtual void ViewClosing() OVERRIDE;
79 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 79 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
80 virtual void OpenSettings() OVERRIDE; 80 virtual void OpenSettings() OVERRIDE;
81 virtual void OpenHelp() OVERRIDE; 81 virtual void OpenHelp() OVERRIDE;
82 virtual void OpenFeedback() OVERRIDE; 82 virtual void OpenFeedback() OVERRIDE;
83 virtual void ToggleSpeechRecognition() OVERRIDE;
83 virtual void ShowForProfileByPath( 84 virtual void ShowForProfileByPath(
84 const base::FilePath& profile_path) OVERRIDE; 85 const base::FilePath& profile_path) OVERRIDE;
85 virtual content::WebContents* GetStartPageContents() OVERRIDE; 86 virtual content::WebContents* GetStartPageContents() OVERRIDE;
86 virtual const Users& GetUsers() const OVERRIDE; 87 virtual const Users& GetUsers() const OVERRIDE;
87 88
88 // Overridden from app_list::StartPageObserver: 89 // Overridden from app_list::StartPageObserver:
89 virtual void OnSearch(const base::string16& query) OVERRIDE; 90 virtual void OnSearch(const base::string16& query) OVERRIDE;
91 virtual void OnSpeechRecognitionStateChanged(bool recognizing) OVERRIDE;
90 92
91 // Overridden from content::NotificationObserver: 93 // Overridden from content::NotificationObserver:
92 virtual void Observe(int type, 94 virtual void Observe(int type,
93 const content::NotificationSource& source, 95 const content::NotificationSource& source,
94 const content::NotificationDetails& details) OVERRIDE; 96 const content::NotificationDetails& details) OVERRIDE;
95 97
96 // Overridden from ProfileInfoCacheObserver: 98 // Overridden from ProfileInfoCacheObserver:
97 virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; 99 virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
98 virtual void OnProfileWasRemoved(const base::FilePath& profile_path, 100 virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
99 const base::string16& profile_name) OVERRIDE; 101 const base::string16& profile_name) OVERRIDE;
(...skipping 11 matching lines...) Expand all
111 content::NotificationRegistrar registrar_; 113 content::NotificationRegistrar registrar_;
112 ChromeSigninDelegate signin_delegate_; 114 ChromeSigninDelegate signin_delegate_;
113 #if defined(USE_ASH) 115 #if defined(USE_ASH)
114 scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; 116 scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;
115 #endif 117 #endif
116 118
117 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); 119 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
118 }; 120 };
119 121
120 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 122 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/app_list/start_page.js ('k') | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698