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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_shortcut_launcher_item_controll er.h" 5 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/launcher/launcher.h" 9 #include "ash/launcher/launcher.h"
10 #include "ash/launcher/launcher_model.h" 10 #include "ash/shelf/shelf_model.h"
11 #include "ash/shelf/shelf_model_util.h" 11 #include "ash/shelf/shelf_model_util.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h " 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h "
17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h" 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
19 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 19 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
20 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 20 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
(...skipping 29 matching lines...) Expand all
50 BrowserShortcutLauncherItemController:: 50 BrowserShortcutLauncherItemController::
51 ~BrowserShortcutLauncherItemController() { 51 ~BrowserShortcutLauncherItemController() {
52 } 52 }
53 53
54 void BrowserShortcutLauncherItemController::UpdateBrowserItemState() { 54 void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
55 // The shell will not be available for win7_aura unittests like 55 // The shell will not be available for win7_aura unittests like
56 // ChromeLauncherControllerTest.BrowserMenuGeneration. 56 // ChromeLauncherControllerTest.BrowserMenuGeneration.
57 if (!ash::Shell::HasInstance()) 57 if (!ash::Shell::HasInstance())
58 return; 58 return;
59 59
60 ash::LauncherModel* model = launcher_controller()->model(); 60 ash::ShelfModel* model = launcher_controller()->model();
61 61
62 // Determine the new browser's active state and change if necessary. 62 // Determine the new browser's active state and change if necessary.
63 int browser_index = 63 int browser_index =
64 ash::GetShelfItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model); 64 ash::GetShelfItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model);
65 DCHECK_GE(browser_index, 0); 65 DCHECK_GE(browser_index, 0);
66 ash::LauncherItem browser_item = model->items()[browser_index]; 66 ash::LauncherItem browser_item = model->items()[browser_index];
67 ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED; 67 ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED;
68 68
69 aura::Window* window = ash::wm::GetActiveWindow(); 69 aura::Window* window = ash::wm::GetActiveWindow();
70 if (window) { 70 if (window) {
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 return (browser && 340 return (browser &&
341 launcher_controller()->IsBrowserFromActiveUser(browser) && 341 launcher_controller()->IsBrowserFromActiveUser(browser) &&
342 browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH && 342 browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
343 (browser->is_type_tabbed() || 343 (browser->is_type_tabbed() ||
344 !browser->is_app() || 344 !browser->is_app() ||
345 !browser->is_type_popup() || 345 !browser->is_type_popup() ||
346 launcher_controller()-> 346 launcher_controller()->
347 GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName( 347 GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(
348 browser->app_name())) <= 0)); 348 browser->app_name())) <= 0));
349 } 349 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698