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

Side by Side Diff: chrome/browser/gtk/import_progress_dialog_gtk.cc

Issue 4282003: Fix type inconsistency with StartImportingWithUI and ProfileInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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
« no previous file with comments | « chrome/browser/first_run/first_run_win.cc ('k') | chrome/browser/importer/importer.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/import_progress_dialog_gtk.h" 5 #include "chrome/browser/gtk/import_progress_dialog_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 if (response == GTK_RESPONSE_REJECT) 209 if (response == GTK_RESPONSE_REJECT)
210 importer_host_->Cancel(); 210 importer_host_->Cancel();
211 } 211 }
212 212
213 void ImportProgressDialogGtk::ShowDialog() { 213 void ImportProgressDialogGtk::ShowDialog() {
214 gtk_widget_show_all(dialog_); 214 gtk_widget_show_all(dialog_);
215 } 215 }
216 216
217 217
218 void StartImportingWithUI(GtkWindow* parent, 218 void StartImportingWithUI(GtkWindow* parent,
219 int16 items, 219 uint16 items,
220 ImporterHost* importer_host, 220 ImporterHost* importer_host,
221 const ProfileInfo& browser_profile, 221 const ProfileInfo& browser_profile,
222 Profile* profile, 222 Profile* profile,
223 ImportObserver* observer, 223 ImportObserver* observer,
224 bool first_run) { 224 bool first_run) {
225 DCHECK_NE(0, items); 225 DCHECK_NE(0, items);
226 ImportProgressDialogGtk::StartImport(parent, items, importer_host, 226 ImportProgressDialogGtk::StartImport(parent, items, importer_host,
227 browser_profile, profile, observer, 227 browser_profile, profile, observer,
228 first_run); 228 first_run);
229 } 229 }
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run_win.cc ('k') | chrome/browser/importer/importer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698