chrome/browser/ui/ash/launcher/browser_status_monitor.cc - Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)

Patch Set: Address comment. Created 3 years, 9 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 | « chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/browser_status_monitor.h"	5 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"

6	6

7 #include "ash/common/shelf/shelf_item_types.h"

8 #include "ash/shell.h"	7 #include "ash/shell.h"

9 #include "ash/wm/window_util.h"	8 #include "ash/wm/window_util.h"

10 #include "base/macros.h"	9 #include "base/macros.h"

11 #include "base/memory/ptr_util.h"	10 #include "base/memory/ptr_util.h"

12 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"	11 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"

13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"	13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"

15 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/browser_finder.h"	15 #include "chrome/browser/ui/browser_finder.h"

17 #include "chrome/browser/ui/browser_list.h"	16 #include "chrome/browser/ui/browser_list.h"

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
299 content::WebContents* contents) {	298 content::WebContents* contents) {

300 return launcher_controller_->GetShelfIDForWebContents(contents);	299 return launcher_controller_->GetShelfIDForWebContents(contents);

301 }	300 }

302	301

303 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(	302 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(

304 Browser* browser,	303 Browser* browser,

305 content::WebContents* web_contents) {	304 content::WebContents* web_contents) {

306 launcher_controller_->GetBrowserShortcutLauncherItemController()->	305 launcher_controller_->GetBrowserShortcutLauncherItemController()->

307 SetShelfIDForBrowserWindowContents(browser, web_contents);	306 SetShelfIDForBrowserWindowContents(browser, web_contents);

308 }	307 }

OLD	NEW