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

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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
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/shelf/shelf_model.h" 9 #include "ash/common/shelf/shelf_model.h"
10 #include "ash/shelf/shelf_util.h" 10 #include "ash/shelf/shelf_util.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h " 15 #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_tab.h" 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
18 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 18 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
19 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 19 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 !browser->window()->IsMinimized()) { 365 !browser->window()->IsMinimized()) {
366 continue; 366 continue;
367 } 367 }
368 if (!IsBrowserRepresentedInBrowserList(browser) && 368 if (!IsBrowserRepresentedInBrowserList(browser) &&
369 !browser->is_type_tabbed()) 369 !browser->is_type_tabbed())
370 continue; 370 continue;
371 active_browsers.push_back(browser); 371 active_browsers.push_back(browser);
372 } 372 }
373 return active_browsers; 373 return active_browsers;
374 } 374 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698