chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc - Issue 12313118: Refactor: Shelf Widget

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: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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

« ash/shelf/shelf_layout_manager.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h ('k') | chrome/browser/ui/ash/shelf_browsertest.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

index 2ea2d9f61490131c00f00776f3ed04880be5aa3e..100cb4fb1c99c6e209a9f8b1563ab7c3f3e97b1c 100644

--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

@@ -79,8 +79,7 @@ string16 ShellWindowLauncherItemController::GetTitle() {

return GetAppTitle();

}

-bool ShellWindowLauncherItemController::HasWindow(

- aura::Window* window) const {

+bool ShellWindowLauncherItemController::HasWindow(aura::Window* window) const {

ShellWindowList::const_iterator iter =

std::find_if(shell_windows_.begin(), shell_windows_.end(),

ShellWindowHasWindow(window));