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

Side by Side Diff: ash/system/ime_menu/ime_menu_tray.cc

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 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
« no previous file with comments | « ash/system/date/tray_system_info.cc ('k') | ash/system/network/tray_vpn.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_menu/ime_menu_tray.h" 5 #include "ash/system/ime_menu/ime_menu_tray.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/ash_constants.h" 8 #include "ash/ash_constants.h"
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/resources/grit/ash_resources.h" 10 #include "ash/resources/grit/ash_resources.h"
11 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
12 #include "ash/session/session_controller.h" 12 #include "ash/session/session_controller.h"
13 #include "ash/shelf/wm_shelf.h" 13 #include "ash/shelf/wm_shelf.h"
14 #include "ash/shelf/wm_shelf_util.h" 14 #include "ash/shelf/wm_shelf_util.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/shell_port.h" 16 #include "ash/shell_port.h"
17 #include "ash/strings/grit/ash_strings.h" 17 #include "ash/strings/grit/ash_strings.h"
18 #include "ash/system/ime_menu/ime_list_view.h" 18 #include "ash/system/ime_menu/ime_list_view.h"
19 #include "ash/system/tray/system_menu_button.h" 19 #include "ash/system/tray/system_menu_button.h"
20 #include "ash/system/tray/system_tray_controller.h" 20 #include "ash/system/tray/system_tray_controller.h"
21 #include "ash/system/tray/system_tray_delegate.h" 21 #include "ash/system/tray/system_tray_delegate.h"
22 #include "ash/system/tray/system_tray_notifier.h" 22 #include "ash/system/tray/system_tray_notifier.h"
23 #include "ash/system/tray/tray_constants.h" 23 #include "ash/system/tray/tray_constants.h"
24 #include "ash/system/tray/tray_container.h"
24 #include "ash/system/tray/tray_popup_item_style.h" 25 #include "ash/system/tray/tray_popup_item_style.h"
25 #include "ash/system/tray/tray_popup_utils.h" 26 #include "ash/system/tray/tray_popup_utils.h"
26 #include "ash/system/tray/tray_utils.h" 27 #include "ash/system/tray/tray_utils.h"
27 #include "ash/wm_window.h" 28 #include "ash/wm_window.h"
28 #include "base/metrics/histogram_macros.h" 29 #include "base/metrics/histogram_macros.h"
29 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
30 #include "components/session_manager/session_manager_types.h" 31 #include "components/session_manager/session_manager_types.h"
31 #include "ui/base/ime/chromeos/input_method_manager.h" 32 #include "ui/base/ime/chromeos/input_method_manager.h"
32 #include "ui/base/ime/ime_bridge.h" 33 #include "ui/base/ime/ime_bridge.h"
33 #include "ui/base/ime/text_input_client.h" 34 #include "ui/base/ime/text_input_client.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 scroller()->ClipHeightTo(height_range.start(), height_range.end()); 276 scroller()->ClipHeightTo(height_range.start(), height_range.end());
276 ImeListView::Layout(); 277 ImeListView::Layout();
277 } 278 }
278 279
279 DISALLOW_COPY_AND_ASSIGN(ImeMenuListView); 280 DISALLOW_COPY_AND_ASSIGN(ImeMenuListView);
280 }; 281 };
281 282
282 } // namespace 283 } // namespace
283 284
284 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf) 285 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
285 : TrayBackgroundView(wm_shelf, true), 286 : TrayBackgroundView(wm_shelf),
286 label_(new ImeMenuLabel()), 287 label_(new ImeMenuLabel()),
287 show_keyboard_(false), 288 show_keyboard_(false),
288 force_show_keyboard_(false), 289 force_show_keyboard_(false),
289 should_block_shelf_auto_hide_(false), 290 should_block_shelf_auto_hide_(false),
290 keyboard_suppressed_(false), 291 keyboard_suppressed_(false),
291 show_bubble_after_keyboard_hidden_(false) { 292 show_bubble_after_keyboard_hidden_(false) {
292 SetInkDropMode(InkDropMode::ON); 293 SetInkDropMode(InkDropMode::ON);
293 SetupLabelForTray(label_); 294 SetupLabelForTray(label_);
294 label_->SetElideBehavior(gfx::TRUNCATE); 295 label_->SetElideBehavior(gfx::TRUNCATE);
295 tray_container()->AddChildView(label_); 296 tray_container()->AddChildView(label_);
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 553 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
553 554
554 // Updates the tray label based on the current input method. 555 // Updates the tray label based on the current input method.
555 if (current_ime_.third_party) 556 if (current_ime_.third_party)
556 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 557 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
557 else 558 else
558 label_->SetText(current_ime_.short_name); 559 label_->SetText(current_ime_.short_name);
559 } 560 }
560 561
561 } // namespace ash 562 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/tray_system_info.cc ('k') | ash/system/network/tray_vpn.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698