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

Side by Side Diff: ash/common/system/ime/tray_ime_chromeos.cc

Issue 2193913002: Added Ash.SystemMenu.DefaultView.VisibleRows histogram. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Merge remote-tracking branch 'refs/remotes/branch-heads/2785' into drover_2785 Created 4 years, 4 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
« no previous file with comments | « ash/common/system/date/tray_date.cc ('k') | ash/common/system/tray/system_tray_bubble.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/system/ime/tray_ime_chromeos.h" 5 #include "ash/common/system/ime/tray_ime_chromeos.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/system/tray/hover_highlight_view.h" 10 #include "ash/common/system/tray/hover_highlight_view.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 std::map<views::View*, std::string> property_map_; 217 std::map<views::View*, std::string> property_map_;
218 views::View* settings_; 218 views::View* settings_;
219 views::View* keyboard_status_; 219 views::View* keyboard_status_;
220 220
221 DISALLOW_COPY_AND_ASSIGN(IMEDetailedView); 221 DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
222 }; 222 };
223 223
224 } // namespace tray 224 } // namespace tray
225 225
226 TrayIME::TrayIME(SystemTray* system_tray) 226 TrayIME::TrayIME(SystemTray* system_tray)
227 : SystemTrayItem(system_tray), 227 : SystemTrayItem(system_tray, UMA_IME),
228 tray_label_(NULL), 228 tray_label_(NULL),
229 default_(NULL), 229 default_(NULL),
230 detailed_(NULL), 230 detailed_(NULL),
231 keyboard_suppressed_(false), 231 keyboard_suppressed_(false),
232 is_visible_(true) { 232 is_visible_(true) {
233 SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier(); 233 SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
234 tray_notifier->AddVirtualKeyboardObserver(this); 234 tray_notifier->AddVirtualKeyboardObserver(this);
235 tray_notifier->AddAccessibilityObserver(this); 235 tray_notifier->AddAccessibilityObserver(this);
236 tray_notifier->AddIMEObserver(this); 236 tray_notifier->AddIMEObserver(this);
237 } 237 }
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 else 366 else
367 Update(); 367 Update();
368 } 368 }
369 369
370 bool TrayIME::ShouldDefaultViewBeVisible() { 370 bool TrayIME::ShouldDefaultViewBeVisible() {
371 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 || 371 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
372 ShouldShowKeyboardToggle()); 372 ShouldShowKeyboardToggle());
373 } 373 }
374 374
375 } // namespace ash 375 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/date/tray_date.cc ('k') | ash/common/system/tray/system_tray_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698