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

Side by Side Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master Created 8 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/extensions/install_extension_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/webui/ntp/app_launcher_handler.h" 5 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "grit/browser_resources.h" 49 #include "grit/browser_resources.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "net/base/escape.h" 51 #include "net/base/escape.h"
52 #include "ui/base/animation/animation.h" 52 #include "ui/base/animation/animation.h"
53 #include "ui/base/l10n/l10n_util.h" 53 #include "ui/base/l10n/l10n_util.h"
54 #include "ui/gfx/codec/png_codec.h" 54 #include "ui/gfx/codec/png_codec.h"
55 55
56 using application_launch::LaunchParams; 56 using application_launch::LaunchParams;
57 using application_launch::OpenApplication; 57 using application_launch::OpenApplication;
58 using content::WebContents; 58 using content::WebContents;
59 using extensions::CrxInstaller;
59 using extensions::Extension; 60 using extensions::Extension;
60 using extensions::ExtensionPrefs; 61 using extensions::ExtensionPrefs;
61 62
62 namespace { 63 namespace {
63 64
64 const net::UnescapeRule::Type kUnescapeRules = 65 const net::UnescapeRule::Type kUnescapeRules =
65 net::UnescapeRule::NORMAL | net::UnescapeRule::URL_SPECIAL_CHARS; 66 net::UnescapeRule::NORMAL | net::UnescapeRule::URL_SPECIAL_CHARS;
66 67
67 extension_misc::AppLaunchBucket ParseLaunchSource( 68 extension_misc::AppLaunchBucket ParseLaunchSource(
68 const std::string& launch_source) { 69 const std::string& launch_source) {
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 995
995 void AppLauncherHandler::UninstallDefaultApps() { 996 void AppLauncherHandler::UninstallDefaultApps() {
996 AppsPromo* apps_promo = extension_service_->apps_promo(); 997 AppsPromo* apps_promo = extension_service_->apps_promo();
997 const extensions::ExtensionIdSet& app_ids = apps_promo->old_default_apps(); 998 const extensions::ExtensionIdSet& app_ids = apps_promo->old_default_apps();
998 for (extensions::ExtensionIdSet::const_iterator iter = app_ids.begin(); 999 for (extensions::ExtensionIdSet::const_iterator iter = app_ids.begin();
999 iter != app_ids.end(); ++iter) { 1000 iter != app_ids.end(); ++iter) {
1000 if (extension_service_->GetExtensionById(*iter, true)) 1001 if (extension_service_->GetExtensionById(*iter, true))
1001 extension_service_->UninstallExtension(*iter, false, NULL); 1002 extension_service_->UninstallExtension(*iter, false, NULL);
1002 } 1003 }
1003 } 1004 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/install_extension_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698