chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems...

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/browser_shortcut_launcher_item_controller.cc

Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: OWNERS Created 6 years, 11 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/browser_status_monitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3fdb5f4228deb81c6a8a19a2fddc330ac42c0019..17a3cea73563d574d8116511a373e6b9ec3ce81a 100644

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

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

@@ -58,7 +58,7 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {

// Determine the new browser's active state and change if necessary.

int browser_index = model->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);

DCHECK_GE(browser_index, 0);

- ash::LauncherItem browser_item = model->items()[browser_index];

+ ash::ShelfItem browser_item = model->items()[browser_index];

ash::ShelfItemStatus browser_status = ash::STATUS_CLOSED;

aura::Window* window = ash::wm::GetActiveWindow();

@@ -74,7 +74,7 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {

content::WebContents* contents =

browser->tab_strip_model()->GetActiveWebContents();

if (contents &&

- (launcher_controller()->GetLauncherIDForWebContents(contents) !=

+ (launcher_controller()->GetShelfIDForWebContents(contents) !=

browser_item.id))

browser_status = ash::STATUS_RUNNING;

}

@@ -224,8 +224,8 @@ base::string16 BrowserShortcutLauncherItemController::GetTitle() {

ui::MenuModel* BrowserShortcutLauncherItemController::CreateContextMenu(

aura::Window* root_window) {

- ash::LauncherItem item =

- *(launcher_controller()->model()->ItemByID(launcher_id()));

+ ash::ShelfItem item =

+ *(launcher_controller()->model()->ItemByID(shelf_id()));

return new LauncherContextMenu(launcher_controller(), &item, root_window);

}

@@ -324,6 +324,6 @@ bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(

!browser->is_app() ||

!browser->is_type_popup() ||

launcher_controller()->

- GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(

+ GetShelfIDForAppID(web_app::GetExtensionIdFromApplicationName(

browser->app_name())) <= 0));

}