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

Side by Side Diff: chrome/browser/ui/webui/app_list/start_page_handler.cc

Issue 405483002: Update the 'old' hotword extension version. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/webui/app_list/start_page_handler.h" 5 #include "chrome/browser/ui/webui/app_list/start_page_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 17 matching lines...) Expand all
28 #include "extensions/common/extension_icon_set.h" 28 #include "extensions/common/extension_icon_set.h"
29 #include "ui/app_list/app_list_switches.h" 29 #include "ui/app_list/app_list_switches.h"
30 #include "ui/app_list/speech_ui_model_observer.h" 30 #include "ui/app_list/speech_ui_model_observer.h"
31 #include "ui/events/event_constants.h" 31 #include "ui/events/event_constants.h"
32 32
33 namespace app_list { 33 namespace app_list {
34 34
35 namespace { 35 namespace {
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 const char kOldHotwordExtensionVersionString[] = "0.1.1.5019"; 38 const char kOldHotwordExtensionVersionString[] = "0.1.1.5023";
39 #endif 39 #endif
40 40
41 scoped_ptr<base::DictionaryValue> CreateAppInfo( 41 scoped_ptr<base::DictionaryValue> CreateAppInfo(
42 const extensions::Extension* app) { 42 const extensions::Extension* app) {
43 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); 43 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
44 dict->SetString("appId", app->id()); 44 dict->SetString("appId", app->id());
45 dict->SetString("textTitle", app->short_name()); 45 dict->SetString("textTitle", app->short_name());
46 dict->SetString("title", app->name()); 46 dict->SetString("title", app->name());
47 47
48 const bool grayscale = false; 48 const bool grayscale = false;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 else if (state_string == "NETWORK_ERROR") 260 else if (state_string == "NETWORK_ERROR")
261 new_state = SPEECH_RECOGNITION_NETWORK_ERROR; 261 new_state = SPEECH_RECOGNITION_NETWORK_ERROR;
262 262
263 StartPageService* service = 263 StartPageService* service =
264 StartPageService::Get(Profile::FromWebUI(web_ui())); 264 StartPageService::Get(Profile::FromWebUI(web_ui()));
265 if (service) 265 if (service)
266 service->OnSpeechRecognitionStateChanged(new_state); 266 service->OnSpeechRecognitionStateChanged(new_state);
267 } 267 }
268 268
269 } // namespace app_list 269 } // namespace app_list
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698