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

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

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted@: test fixes and remove a const-ref. Created 5 years, 10 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 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 static void FindAnchorPoint(const gfx::Size& window_size, 47 static void FindAnchorPoint(const gfx::Size& window_size,
48 const gfx::Display& display, 48 const gfx::Display& display,
49 int primary_display_height, 49 int primary_display_height,
50 bool cursor_is_visible, 50 bool cursor_is_visible,
51 const gfx::Point& cursor, 51 const gfx::Point& cursor,
52 NSPoint* target_origin, 52 NSPoint* target_origin,
53 NSPoint* start_origin); 53 NSPoint* start_origin);
54 54
55 void ShowWindowNearDock(); 55 void ShowWindowNearDock();
56 void WindowAnimationDidEnd(); 56 void WindowAnimationDidEnd();
57 void InitWithProfilePath(Profile* initial_profile,
58 const base::FilePath& profile_path);
57 59
58 // AppListService overrides: 60 // AppListService overrides:
59 void Init(Profile* initial_profile) override; 61 void Init(Profile* initial_profile) override;
60 void ShowForProfile(Profile* requested_profile) override; 62 void ShowForProfile(Profile* requested_profile) override;
61 void DismissAppList() override; 63 void DismissAppList() override;
62 void ShowForCustomLauncherPage(Profile* profile) override; 64 void ShowForCustomLauncherPage(Profile* profile) override;
63 bool IsAppListVisible() const override; 65 bool IsAppListVisible() const override;
64 void EnableAppList(Profile* initial_profile, 66 void EnableAppList(Profile* initial_profile,
65 AppListEnableSource enable_source) override; 67 AppListEnableSource enable_source) override;
66 gfx::NativeWindow GetAppListWindow() override; 68 gfx::NativeWindow GetAppListWindow() override;
(...skipping 26 matching lines...) Expand all
93 base::scoped_nsobject<AppListAnimationController> animation_controller_; 95 base::scoped_nsobject<AppListAnimationController> animation_controller_;
94 base::scoped_nsobject<NSRunningApplication> previously_active_application_; 96 base::scoped_nsobject<NSRunningApplication> previously_active_application_;
95 NSPoint last_start_origin_; 97 NSPoint last_start_origin_;
96 Profile* profile_; 98 Profile* profile_;
97 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_; 99 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_;
98 100
99 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac); 101 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);
100 }; 102 };
101 103
102 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 104 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc ('k') | chrome/browser/ui/app_list/app_list_service_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698