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

Side by Side Diff: chrome/browser/extensions/component_loader.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 (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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 #if defined(OS_CHROMEOS) 59 #if defined(OS_CHROMEOS)
60 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 60 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
61 #include "chromeos/chromeos_switches.h" 61 #include "chromeos/chromeos_switches.h"
62 #include "content/public/browser/site_instance.h" 62 #include "content/public/browser/site_instance.h"
63 #include "content/public/browser/storage_partition.h" 63 #include "content/public/browser/storage_partition.h"
64 #include "extensions/browser/extensions_browser_client.h" 64 #include "extensions/browser/extensions_browser_client.h"
65 #include "storage/browser/fileapi/file_system_context.h" 65 #include "storage/browser/fileapi/file_system_context.h"
66 #endif 66 #endif
67 67
68 #if defined(ENABLE_APP_LIST) 68 #if defined(ENABLE_APP_LIST) || defined(ENABLE_EXTENSIONS)
69 #include "chrome/grit/chromium_strings.h" 69 #include "chrome/grit/chromium_strings.h"
70 #endif 70 #endif
71 71
72 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) 72 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
73 #include "chrome/browser/ui/app_list/google_now_extension.h" 73 #include "chrome/browser/ui/app_list/google_now_extension.h"
74 #endif 74 #endif
75 75
76 using content::BrowserThread; 76 using content::BrowserThread;
77 77
78 namespace extensions { 78 namespace extensions {
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 manifest.release(), 770 manifest.release(),
771 root_directory, 771 root_directory,
772 false); 772 false);
773 CHECK_EQ(extension_id, actual_extension_id); 773 CHECK_EQ(extension_id, actual_extension_id);
774 if (!done_cb.is_null()) 774 if (!done_cb.is_null())
775 done_cb.Run(); 775 done_cb.Run();
776 } 776 }
777 #endif 777 #endif
778 778
779 } // namespace extensions 779 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698