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

Side by Side Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 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 #import "chrome/browser/ui/app_list/app_list_service_mac.h" 5 #import "chrome/browser/ui/app_list/app_list_service_mac.h"
6 6
7 #include <ApplicationServices/ApplicationServices.h> 7 #include <ApplicationServices/ApplicationServices.h>
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 [window makeKeyAndOrderFront:nil]; 499 [window makeKeyAndOrderFront:nil];
500 [NSApp activateIgnoringOtherApps:YES]; 500 [NSApp activateIgnoringOtherApps:YES];
501 RecordAppListLaunch(); 501 RecordAppListLaunch();
502 } 502 }
503 503
504 void AppListServiceMac::WindowAnimationDidEnd() { 504 void AppListServiceMac::WindowAnimationDidEnd() {
505 [animation_controller_ cleanupOnUIThread]; 505 [animation_controller_ cleanupOnUIThread];
506 } 506 }
507 507
508 // static 508 // static
509 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) { 509 AppListService* AppListService::Get(ui::HostDesktopType desktop_type) {
510 return GetActiveInstance(); 510 return GetActiveInstance();
511 } 511 }
512 512
513 // static 513 // static
514 void AppListService::InitAll(Profile* initial_profile, 514 void AppListService::InitAll(Profile* initial_profile,
515 const base::FilePath& profile_path) { 515 const base::FilePath& profile_path) {
516 GetActiveInstance()->InitWithProfilePath(initial_profile, profile_path); 516 GetActiveInstance()->InitWithProfilePath(initial_profile, profile_path);
517 } 517 }
518 518
519 @implementation AppListAnimationController 519 @implementation AppListAnimationController
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 578
579 - (void)animationDidEnd:(NSAnimation*)animation { 579 - (void)animationDidEnd:(NSAnimation*)animation {
580 content::BrowserThread::PostTask( 580 content::BrowserThread::PostTask(
581 content::BrowserThread::UI, 581 content::BrowserThread::UI,
582 FROM_HERE, 582 FROM_HERE,
583 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, 583 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
584 base::Unretained(GetActiveInstance()))); 584 base::Unretained(GetActiveInstance())));
585 } 585 }
586 586
587 @end 587 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698