ash/common/system/chromeos/ime_menu/ime_menu_tray.cc - Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address nits 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 side-by-side diff with in-line comments

Download patch

Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

index 5b9cd38b88a8bb2f1deb7240b993a381c04807e3..4453ad526b30efb48793162702654a6623ea204a 100644

--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

@@ -4,6 +4,7 @@

#include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"

+#include "ash/common/material_design/material_design_controller.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/shelf/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

@@ -151,7 +152,8 @@ ImeMenuTray::~ImeMenuTray() {

void ImeMenuTray::SetShelfAlignment(ShelfAlignment alignment) {

TrayBackgroundView::SetShelfAlignment(alignment);

- tray_container()->SetBorder(views::Border::NullBorder());

+ if (!ash::MaterialDesignController::IsShelfMaterial())

+ tray_container()->SetBorder(views::Border::NullBorder());

}

base::string16 ImeMenuTray::GetAccessibleNameForTray() {

« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/session/logout_button_tray.cc » ('j') | no next file with comments »