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

Side by Side Diff: ash/system/ime/tray_ime.cc

Issue 9999018: chrome/browser/chromeos/input_method/ refactoring [part 6 of 6] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, remove |should_hide_properties_| Created 8 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 | 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 #include "ash/system/ime/tray_ime.h" 5 #include "ash/system/ime/tray_ime.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ime_find = ime_map_.find(sender); 151 ime_find = ime_map_.find(sender);
152 if (ime_find != ime_map_.end()) { 152 if (ime_find != ime_map_.end()) {
153 std::string ime_id = ime_find->second; 153 std::string ime_id = ime_find->second;
154 delegate->SwitchIME(ime_id); 154 delegate->SwitchIME(ime_id);
155 GetWidget()->Close(); 155 GetWidget()->Close();
156 } else { 156 } else {
157 std::map<views::View*, IMEPropertyInfo>::const_iterator prop_find; 157 std::map<views::View*, IMEPropertyInfo>::const_iterator prop_find;
158 prop_find = property_map_.find(sender); 158 prop_find = property_map_.find(sender);
159 if (prop_find != property_map_.end()) { 159 if (prop_find != property_map_.end()) {
160 const IMEPropertyInfo& prop = prop_find->second; 160 const IMEPropertyInfo& prop = prop_find->second;
161 delegate->ActivateIMEProperty(prop.key, prop.is_selection); 161 delegate->ActivateIMEProperty(prop.key);
162 GetWidget()->Close(); 162 GetWidget()->Close();
163 } 163 }
164 } 164 }
165 } 165 }
166 } 166 }
167 167
168 user::LoginStatus login_; 168 user::LoginStatus login_;
169 169
170 std::map<views::View*, std::string> ime_map_; 170 std::map<views::View*, std::string> ime_map_;
171 std::map<views::View*, IMEPropertyInfo> property_map_; 171 std::map<views::View*, IMEPropertyInfo> property_map_;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 UpdateTrayLabel(current, list.size()); 230 UpdateTrayLabel(current, list.size());
231 231
232 if (default_.get()) 232 if (default_.get())
233 default_->UpdateLabel(current); 233 default_->UpdateLabel(current);
234 if (detailed_.get()) 234 if (detailed_.get())
235 detailed_->Update(list, property_list); 235 detailed_->Update(list, property_list);
236 } 236 }
237 237
238 } // namespace internal 238 } // namespace internal
239 } // namespace ash 239 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698