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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 #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 #include <stddef.h> 9 #include <stddef.h>
10 10
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/memory/singleton.h" 17 #include "base/memory/singleton.h"
18 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
19 #include "base/prefs/pref_service.h"
20 #import "chrome/browser/app_controller_mac.h" 19 #import "chrome/browser/app_controller_mac.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/profiles/profile_info_cache.h" 22 #include "chrome/browser/profiles/profile_info_cache.h"
24 #include "chrome/browser/profiles/profile_manager.h" 23 #include "chrome/browser/profiles/profile_manager.h"
25 #include "chrome/browser/ui/app_list/app_list_positioner.h" 24 #include "chrome/browser/ui/app_list/app_list_positioner.h"
26 #include "chrome/browser/ui/app_list/app_list_service.h" 25 #include "chrome/browser/ui/app_list/app_list_service.h"
27 #include "chrome/browser/ui/app_list/app_list_service_cocoa_mac.h" 26 #include "chrome/browser/ui/app_list/app_list_service_cocoa_mac.h"
28 #include "chrome/browser/ui/app_list/app_list_service_impl.h" 27 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
29 #include "chrome/browser/ui/app_list/app_list_util.h" 28 #include "chrome/browser/ui/app_list/app_list_util.h"
30 #include "chrome/browser/ui/browser_commands.h" 29 #include "chrome/browser/ui/browser_commands.h"
31 #include "chrome/browser/ui/extensions/application_launch.h" 30 #include "chrome/browser/ui/extensions/application_launch.h"
32 #include "chrome/browser/web_applications/web_app.h" 31 #include "chrome/browser/web_applications/web_app.h"
33 #include "chrome/browser/web_applications/web_app_mac.h" 32 #include "chrome/browser/web_applications/web_app_mac.h"
34 #include "chrome/common/channel_info.h" 33 #include "chrome/common/channel_info.h"
35 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 35 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
37 #include "chrome/common/mac/app_mode_common.h" 36 #include "chrome/common/mac/app_mode_common.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "chrome/grit/google_chrome_strings.h" 38 #include "chrome/grit/google_chrome_strings.h"
39 #include "components/prefs/pref_service.h"
40 #include "components/version_info/version_info.h" 40 #include "components/version_info/version_info.h"
41 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
42 #include "extensions/browser/extension_system.h" 42 #include "extensions/browser/extension_system.h"
43 #include "extensions/common/manifest_handlers/file_handler_info.h" 43 #include "extensions/common/manifest_handlers/file_handler_info.h"
44 #include "grit/chrome_unscaled_resources.h" 44 #include "grit/chrome_unscaled_resources.h"
45 #include "net/base/url_util.h" 45 #include "net/base/url_util.h"
46 #include "ui/app_list/app_list_switches.h" 46 #include "ui/app_list/app_list_switches.h"
47 #include "ui/app_list/search_box_model.h" 47 #include "ui/app_list/search_box_model.h"
48 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
49 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 581
582 - (void)animationDidEnd:(NSAnimation*)animation { 582 - (void)animationDidEnd:(NSAnimation*)animation {
583 content::BrowserThread::PostTask( 583 content::BrowserThread::PostTask(
584 content::BrowserThread::UI, 584 content::BrowserThread::UI,
585 FROM_HERE, 585 FROM_HERE,
586 base::Bind(&AppListServiceMac::WindowAnimationDidEnd, 586 base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
587 base::Unretained(GetActiveInstance()))); 587 base::Unretained(GetActiveInstance())));
588 } 588 }
589 589
590 @end 590 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698