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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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 28 matching lines...) Expand all
39 #include "extensions/common/extension.h" 39 #include "extensions/common/extension.h"
40 #include "extensions/common/extension_l10n_util.h" 40 #include "extensions/common/extension_l10n_util.h"
41 #include "extensions/common/file_util.h" 41 #include "extensions/common/file_util.h"
42 #include "extensions/common/manifest_constants.h" 42 #include "extensions/common/manifest_constants.h"
43 #include "ppapi/features/features.h" 43 #include "ppapi/features/features.h"
44 #include "printing/features/features.h" 44 #include "printing/features/features.h"
45 #include "ui/base/l10n/l10n_util.h" 45 #include "ui/base/l10n/l10n_util.h"
46 #include "ui/base/resource/resource_bundle.h" 46 #include "ui/base/resource/resource_bundle.h"
47 47
48 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
49 #include "ash/common/system/chromeos/devicetype_utils.h" 49 #include "ash/system/devicetype_utils.h"
50 #include "chromeos/chromeos_switches.h" 50 #include "chromeos/chromeos_switches.h"
51 #include "components/chrome_apps/grit/chrome_apps_resources.h" 51 #include "components/chrome_apps/grit/chrome_apps_resources.h"
52 #include "components/user_manager/user_manager.h" 52 #include "components/user_manager/user_manager.h"
53 #include "content/public/browser/site_instance.h" 53 #include "content/public/browser/site_instance.h"
54 #include "content/public/browser/storage_partition.h" 54 #include "content/public/browser/storage_partition.h"
55 #include "extensions/browser/extensions_browser_client.h" 55 #include "extensions/browser/extensions_browser_client.h"
56 #include "storage/browser/fileapi/file_system_context.h" 56 #include "storage/browser/fileapi/file_system_context.h"
57 #include "ui/file_manager/grit/file_manager_resources.h" 57 #include "ui/file_manager/grit/file_manager_resources.h"
58 #include "ui/keyboard/grit/keyboard_resources.h" 58 #include "ui/keyboard/grit/keyboard_resources.h"
59 #include "ui/keyboard/keyboard_util.h" 59 #include "ui/keyboard/keyboard_util.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 return; // Error already logged. 684 return; // Error already logged.
685 std::string actual_extension_id = 685 std::string actual_extension_id =
686 Add(std::move(manifest), root_directory, false); 686 Add(std::move(manifest), root_directory, false);
687 CHECK_EQ(extension_id, actual_extension_id); 687 CHECK_EQ(extension_id, actual_extension_id);
688 if (!done_cb.is_null()) 688 if (!done_cb.is_null())
689 done_cb.Run(); 689 done_cb.Run();
690 } 690 }
691 #endif 691 #endif
692 692
693 } // namespace extensions 693 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698