OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/browser/extensions/component_loader.h" | 5 #include "chrome/browser/extensions/component_loader.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
59 | 59 |
60 #if defined(OS_CHROMEOS) | 60 #if defined(OS_CHROMEOS) |
61 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 61 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
62 #include "chromeos/chromeos_switches.h" | 62 #include "chromeos/chromeos_switches.h" |
63 #include "content/public/browser/site_instance.h" | 63 #include "content/public/browser/site_instance.h" |
64 #include "content/public/browser/storage_partition.h" | 64 #include "content/public/browser/storage_partition.h" |
65 #include "extensions/browser/extensions_browser_client.h" | 65 #include "extensions/browser/extensions_browser_client.h" |
66 #include "storage/browser/fileapi/file_system_context.h" | 66 #include "storage/browser/fileapi/file_system_context.h" |
67 #endif | 67 #endif |
68 | 68 |
69 #if defined(ENABLE_APP_LIST) | 69 #if defined(ENABLE_APP_LIST) || defined(ENABLE_EXTENSIONS) |
mfomitchev
2015/11/10 21:27:28
No need for this.
Hadi
2015/11/12 16:33:36
If we don't enable app list in features.gni, then
| |
70 #include "chrome/grit/chromium_strings.h" | 70 #include "chrome/grit/chromium_strings.h" |
71 #endif | 71 #endif |
72 | 72 |
73 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) | 73 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) |
74 #include "chrome/browser/ui/app_list/google_now_extension.h" | 74 #include "chrome/browser/ui/app_list/google_now_extension.h" |
75 #endif | 75 #endif |
76 | 76 |
77 using content::BrowserThread; | 77 using content::BrowserThread; |
78 | 78 |
79 namespace extensions { | 79 namespace extensions { |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
768 manifest.release(), | 768 manifest.release(), |
769 root_directory, | 769 root_directory, |
770 false); | 770 false); |
771 CHECK_EQ(extension_id, actual_extension_id); | 771 CHECK_EQ(extension_id, actual_extension_id); |
772 if (!done_cb.is_null()) | 772 if (!done_cb.is_null()) |
773 done_cb.Run(); | 773 done_cb.Run(); |
774 } | 774 } |
775 #endif | 775 #endif |
776 | 776 |
777 } // namespace extensions | 777 } // namespace extensions |
OLD | NEW |