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

Unified Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

Issue 15715018: Make the Remove Extension dialog modal for win app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 7 years, 7 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
Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 3a45759192ba84773b076c36e05fb26061f19826..05790f3a412519a1ad254a6fe1e456486ceeb583 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -50,7 +50,6 @@ class AppListServiceMac : public AppListServiceImpl,
}
void CreateAppList(Profile* profile);
- NSWindow* GetNativeWindow();
void ShowWindowNearDock();
// AppListService overrides:
@@ -59,6 +58,7 @@ class AppListServiceMac : public AppListServiceImpl,
virtual void DismissAppList() OVERRIDE;
virtual bool IsAppListVisible() const OVERRIDE;
virtual void EnableAppList() OVERRIDE;
+ virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
// AppShimHandler overrides:
virtual bool OnShimLaunch(apps::AppShimHandler::Host* host) OVERRIDE;
@@ -168,7 +168,7 @@ void AppListControllerDelegateCocoa::DismissView() {
}
gfx::NativeWindow AppListControllerDelegateCocoa::GetAppListWindow() {
- return AppListServiceMac::GetInstance()->GetNativeWindow();
+ return AppListServiceMac::GetInstance()->GetAppListWindow();
}
bool AppListControllerDelegateCocoa::CanPin() {
@@ -267,7 +267,7 @@ void AppListServiceMac::EnableAppList() {
// TODO(tapted): Implement enable logic here for OSX.
}
-NSWindow* AppListServiceMac::GetNativeWindow() {
+NSWindow* AppListServiceMac::GetAppListWindow() {
return [window_controller_ window];
}
@@ -354,7 +354,7 @@ NSPoint GetAppListWindowOrigin(NSWindow* window) {
}
void AppListServiceMac::ShowWindowNearDock() {
- NSWindow* window = GetNativeWindow();
+ NSWindow* window = GetAppListWindow();
DCHECK(window);
[window setFrameOrigin:GetAppListWindowOrigin(window)];
[window makeKeyAndOrderFront:nil];
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_disabled.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698