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

Side by Side Diff: chrome/browser/chromeos/extensions/input_method_api.cc

Issue 1022143003: Removes flag --enable-new-md-input-view and add a opposite flag: --disable-new-md-input-view. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 #include "chrome/browser/chromeos/extensions/input_method_api.h" 5 #include "chrome/browser/chromeos/extensions/input_method_api.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/extensions/dictionary_event_router.h" 10 #include "chrome/browser/chromeos/extensions/dictionary_event_router.h"
(...skipping 23 matching lines...) Expand all
34 EXTENSION_FUNCTION_VALIDATE(false); 34 EXTENSION_FUNCTION_VALIDATE(false);
35 #else 35 #else
36 base::DictionaryValue* output = new base::DictionaryValue(); 36 base::DictionaryValue* output = new base::DictionaryValue();
37 output->SetBoolean( 37 output->SetBoolean(
38 "isPhysicalKeyboardAutocorrectEnabled", 38 "isPhysicalKeyboardAutocorrectEnabled",
39 base::CommandLine::ForCurrentProcess()->HasSwitch( 39 base::CommandLine::ForCurrentProcess()->HasSwitch(
40 chromeos::switches::kEnablePhysicalKeyboardAutocorrect)); 40 chromeos::switches::kEnablePhysicalKeyboardAutocorrect));
41 output->SetBoolean("isVoiceInputEnabled", 41 output->SetBoolean("isVoiceInputEnabled",
42 !base::CommandLine::ForCurrentProcess()->HasSwitch( 42 !base::CommandLine::ForCurrentProcess()->HasSwitch(
43 chromeos::switches::kDisableVoiceInput)); 43 chromeos::switches::kDisableVoiceInput));
44 output->SetBoolean("isNewMDInputViewEnabled", 44 output->SetBoolean("isNewMDInputViewDisabled",
Shu Chen 2015/03/23 02:16:23 please don't change this.
FengYuan 2015/03/23 05:24:49 Done.
45 base::CommandLine::ForCurrentProcess()->HasSwitch( 45 base::CommandLine::ForCurrentProcess()->HasSwitch(
46 chromeos::switches::kEnableNewMDInputView)); 46 chromeos::switches::kDisableNewMDInputView));
47 return RespondNow(OneArgument(output)); 47 return RespondNow(OneArgument(output));
48 #endif 48 #endif
49 } 49 }
50 50
51 ExtensionFunction::ResponseAction GetCurrentInputMethodFunction::Run() { 51 ExtensionFunction::ResponseAction GetCurrentInputMethodFunction::Run() {
52 #if !defined(OS_CHROMEOS) 52 #if !defined(OS_CHROMEOS)
53 EXTENSION_FUNCTION_VALIDATE(false); 53 EXTENSION_FUNCTION_VALIDATE(false);
54 #else 54 #else
55 chromeos::input_method::InputMethodManager* manager = 55 chromeos::input_method::InputMethodManager* manager =
56 chromeos::input_method::InputMethodManager::Get(); 56 chromeos::input_method::InputMethodManager::Get();
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> > 221 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >
222 g_factory = LAZY_INSTANCE_INITIALIZER; 222 g_factory = LAZY_INSTANCE_INITIALIZER;
223 223
224 // static 224 // static
225 BrowserContextKeyedAPIFactory<InputMethodAPI>* 225 BrowserContextKeyedAPIFactory<InputMethodAPI>*
226 InputMethodAPI::GetFactoryInstance() { 226 InputMethodAPI::GetFactoryInstance() {
227 return g_factory.Pointer(); 227 return g_factory.Pointer();
228 } 228 }
229 229
230 } // namespace extensions 230 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698