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

Side by Side Diff: chrome/browser/ui/webui/options/import_data_handler.h

Issue 24195005: Fix ImportDataHandler crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 20 matching lines...) Expand all
31 // OptionsPageUIHandler: 31 // OptionsPageUIHandler:
32 virtual void GetLocalizedValues( 32 virtual void GetLocalizedValues(
33 base::DictionaryValue* localized_strings) OVERRIDE; 33 base::DictionaryValue* localized_strings) OVERRIDE;
34 virtual void InitializeHandler() OVERRIDE; 34 virtual void InitializeHandler() OVERRIDE;
35 virtual void InitializePage() OVERRIDE; 35 virtual void InitializePage() OVERRIDE;
36 36
37 // content::WebUIMessageHandler: 37 // content::WebUIMessageHandler:
38 virtual void RegisterMessages() OVERRIDE; 38 virtual void RegisterMessages() OVERRIDE;
39 39
40 private: 40 private:
41 void StartImport(const importer::SourceProfile& source_profile,
42 uint16 imported_items);
43
41 void ImportData(const base::ListValue* args); 44 void ImportData(const base::ListValue* args);
42 45
43 // importer::ImporterListObserver: 46 // importer::ImporterListObserver:
44 virtual void OnSourceProfilesLoaded() OVERRIDE; 47 virtual void OnSourceProfilesLoaded() OVERRIDE;
45 48
46 // importer::ImporterProgressObserver: 49 // importer::ImporterProgressObserver:
47 virtual void ImportStarted() OVERRIDE; 50 virtual void ImportStarted() OVERRIDE;
48 virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE; 51 virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE;
49 virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE; 52 virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE;
50 virtual void ImportEnded() OVERRIDE; 53 virtual void ImportEnded() OVERRIDE;
(...skipping 15 matching lines...) Expand all
66 bool import_did_succeed_; 69 bool import_did_succeed_;
67 70
68 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 71 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
69 72
70 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler); 73 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
71 }; 74 };
72 75
73 } // namespace options 76 } // namespace options
74 77
75 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ 78 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698