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

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

Issue 8198003: Convert app_launch_index and page_index from int to StringOrdinal. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Changing strings to StringOrdinals Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/unpacked_installer.h" 5 #include "chrome/browser/extensions/unpacked_installer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "chrome/browser/extensions/extension_install_ui.h" 10 #include "chrome/browser/extensions/extension_install_ui.h"
11 #include "chrome/browser/extensions/extension_prefs.h" 11 #include "chrome/browser/extensions/extension_prefs.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "chrome/common/extensions/extension_file_util.h" 14 #include "chrome/common/extensions/extension_file_util.h"
15 #include "chrome/common/string_ordinal.h"
15 16
16 using content::BrowserThread; 17 using content::BrowserThread;
17 18
18 namespace { 19 namespace {
19 20
20 // Manages an ExtensionInstallUI for a particular extension. 21 // Manages an ExtensionInstallUI for a particular extension.
21 class SimpleExtensionLoadPrompt : public ExtensionInstallUI::Delegate { 22 class SimpleExtensionLoadPrompt : public ExtensionInstallUI::Delegate {
22 public: 23 public:
23 SimpleExtensionLoadPrompt(Profile* profile, 24 SimpleExtensionLoadPrompt(Profile* profile,
24 base::WeakPtr<ExtensionService> extension_service, 25 base::WeakPtr<ExtensionService> extension_service,
(...skipping 24 matching lines...) Expand all
49 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() { 50 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() {
50 } 51 }
51 52
52 void SimpleExtensionLoadPrompt::ShowPrompt() { 53 void SimpleExtensionLoadPrompt::ShowPrompt() {
53 install_ui_->ConfirmInstall(this, extension_); 54 install_ui_->ConfirmInstall(this, extension_);
54 } 55 }
55 56
56 void SimpleExtensionLoadPrompt::InstallUIProceed() { 57 void SimpleExtensionLoadPrompt::InstallUIProceed() {
57 if (service_weak_.get()) 58 if (service_weak_.get())
58 service_weak_->OnExtensionInstalled( 59 service_weak_->OnExtensionInstalled(
59 extension_, false, -1); // Not from web store. 60 extension_, false, StringOrdinal()); // Not from web store.
60 delete this; 61 delete this;
61 } 62 }
62 63
63 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) { 64 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) {
64 delete this; 65 delete this;
65 } 66 }
66 67
67 } // namespace 68 } // namespace
68 69
69 namespace extensions { 70 namespace extensions {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 disabled_extensions->end()) { 205 disabled_extensions->end()) {
205 SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt( 206 SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
206 service_weak_->profile(), 207 service_weak_->profile(),
207 service_weak_, 208 service_weak_,
208 extension); 209 extension);
209 prompt->ShowPrompt(); 210 prompt->ShowPrompt();
210 return; // continues in SimpleExtensionLoadPrompt::InstallUI* 211 return; // continues in SimpleExtensionLoadPrompt::InstallUI*
211 } 212 }
212 service_weak_->OnExtensionInstalled(extension, 213 service_weak_->OnExtensionInstalled(extension,
213 false, // Not from web store. 214 false, // Not from web store.
214 -1); 215 StringOrdinal());
215 } 216 }
216 217
217 } // namespace extensions 218 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698