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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 57
58 // AppListService overrides: 58 // AppListService overrides:
59 virtual void Init(Profile* initial_profile) OVERRIDE; 59 virtual void Init(Profile* initial_profile) override;
60 virtual void CreateForProfile(Profile* requested_profile) OVERRIDE; 60 virtual void CreateForProfile(Profile* requested_profile) override;
61 virtual void ShowForProfile(Profile* requested_profile) OVERRIDE; 61 virtual void ShowForProfile(Profile* requested_profile) override;
62 virtual void DismissAppList() OVERRIDE; 62 virtual void DismissAppList() override;
63 virtual bool IsAppListVisible() const OVERRIDE; 63 virtual bool IsAppListVisible() const override;
64 virtual void EnableAppList(Profile* initial_profile, 64 virtual void EnableAppList(Profile* initial_profile,
65 AppListEnableSource enable_source) OVERRIDE; 65 AppListEnableSource enable_source) override;
66 virtual gfx::NativeWindow GetAppListWindow() OVERRIDE; 66 virtual gfx::NativeWindow GetAppListWindow() override;
67 virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE; 67 virtual AppListControllerDelegate* GetControllerDelegate() override;
68 virtual Profile* GetCurrentAppListProfile() OVERRIDE; 68 virtual Profile* GetCurrentAppListProfile() override;
69 virtual void CreateShortcut() OVERRIDE; 69 virtual void CreateShortcut() override;
70 70
71 // AppListServiceImpl overrides: 71 // AppListServiceImpl overrides:
72 virtual void DestroyAppList() OVERRIDE; 72 virtual void DestroyAppList() override;
73 73
74 // AppShimHandler overrides: 74 // AppShimHandler overrides:
75 virtual void OnShimLaunch(apps::AppShimHandler::Host* host, 75 virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
76 apps::AppShimLaunchType launch_type, 76 apps::AppShimLaunchType launch_type,
77 const std::vector<base::FilePath>& files) OVERRIDE; 77 const std::vector<base::FilePath>& files) override;
78 virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE; 78 virtual void OnShimClose(apps::AppShimHandler::Host* host) override;
79 virtual void OnShimFocus(apps::AppShimHandler::Host* host, 79 virtual void OnShimFocus(apps::AppShimHandler::Host* host,
80 apps::AppShimFocusType focus_type, 80 apps::AppShimFocusType focus_type,
81 const std::vector<base::FilePath>& files) OVERRIDE; 81 const std::vector<base::FilePath>& files) override;
82 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host, 82 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
83 bool hidden) OVERRIDE; 83 bool hidden) override;
84 virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE; 84 virtual void OnShimQuit(apps::AppShimHandler::Host* host) override;
85 85
86 private: 86 private:
87 friend class test::AppListServiceMacTestApi; 87 friend class test::AppListServiceMacTestApi;
88 friend struct DefaultSingletonTraits<AppListServiceMac>; 88 friend struct DefaultSingletonTraits<AppListServiceMac>;
89 89
90 AppListServiceMac(); 90 AppListServiceMac();
91 91
92 base::scoped_nsobject<AppListWindowController> window_controller_; 92 base::scoped_nsobject<AppListWindowController> window_controller_;
93 base::scoped_nsobject<AppListAnimationController> animation_controller_; 93 base::scoped_nsobject<AppListAnimationController> animation_controller_;
94 base::scoped_nsobject<NSRunningApplication> previously_active_application_; 94 base::scoped_nsobject<NSRunningApplication> previously_active_application_;
95 NSPoint last_start_origin_; 95 NSPoint last_start_origin_;
96 Profile* profile_; 96 Profile* profile_;
97 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_; 97 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac); 99 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);
100 }; 100 };
101 101
102 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 102 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698