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

Side by Side Diff: chrome/browser/chromeos/input_method/mock_input_method_manager.cc

Issue 13459008: Support options page handling into ComponentExtensionManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix constructors. Created 7 years, 8 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/input_method/mock_input_method_manager.h" 5 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 namespace input_method { 8 namespace input_method {
9 9
10 MockInputMethodManager::MockInputMethodManager() 10 MockInputMethodManager::MockInputMethodManager()
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 111 }
112 112
113 InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const { 113 InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const {
114 InputMethodDescriptor descriptor = 114 InputMethodDescriptor descriptor =
115 InputMethodDescriptor::GetFallbackInputMethodDescriptor(); 115 InputMethodDescriptor::GetFallbackInputMethodDescriptor();
116 if (!current_input_method_id_.empty()) { 116 if (!current_input_method_id_.empty()) {
117 return InputMethodDescriptor(current_input_method_id_, 117 return InputMethodDescriptor(current_input_method_id_,
118 descriptor.name(), 118 descriptor.name(),
119 descriptor.keyboard_layout(), 119 descriptor.keyboard_layout(),
120 descriptor.language_code(), 120 descriptor.language_code(),
121 "", // options page url.
121 false); 122 false);
122 } 123 }
123 return descriptor; 124 return descriptor;
124 } 125 }
125 126
126 InputMethodPropertyList 127 InputMethodPropertyList
127 MockInputMethodManager::GetCurrentInputMethodProperties() const { 128 MockInputMethodManager::GetCurrentInputMethodProperties() const {
128 return InputMethodPropertyList(); 129 return InputMethodPropertyList();
129 } 130 }
130 131
(...skipping 14 matching lines...) Expand all
145 delegate_.set_active_locale(value); 146 delegate_.set_active_locale(value);
146 } 147 }
147 148
148 void MockInputMethodManager::set_hardware_keyboard_layout( 149 void MockInputMethodManager::set_hardware_keyboard_layout(
149 const std::string& value) { 150 const std::string& value) {
150 delegate_.set_hardware_keyboard_layout(value); 151 delegate_.set_hardware_keyboard_layout(value);
151 } 152 }
152 153
153 } // namespace input_method 154 } // namespace input_method
154 } // namespace chromeos 155 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698