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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

Issue 12022002: Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed problem with ASAN unittest Created 7 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/chrome_launcher_controller_per_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 2a9448671da4d74eb679a6669fa4e2941302670e..8dc043abfd22b6a4f007ed779ea0e4895348132e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -282,6 +282,9 @@ class ChromeLauncherController
friend class BrowserLauncherItemControllerTest;
friend class LauncherPlatformAppBrowserTest;
friend class LauncherAppBrowserTest;
+ // TODO(skuhne): Remove these when the old launcher get removed.
+ friend class LauncherPlatformPerAppAppBrowserTest;
+ friend class LauncherPerAppAppBrowserTest;
// Creates a new app shortcut item and controller on the launcher at |index|.
// Use kInsertItemAtEnd to add a shortcut as the last item.
« no previous file with comments | « chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698