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

Side by Side Diff: chrome/browser/ui/webui/settings/settings_import_data_handler.h

Issue 2769383002: Firefox overlay is seen opened even if Import Overlay is Cancelled.
Patch Set: Addressing Review Comments Created 3 years, 8 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 21 matching lines...) Expand all
32 // SettingsPageUIHandler 32 // SettingsPageUIHandler
33 void RegisterMessages() override; 33 void RegisterMessages() override;
34 void OnJavascriptAllowed() override {} 34 void OnJavascriptAllowed() override {}
35 void OnJavascriptDisallowed() override; 35 void OnJavascriptDisallowed() override;
36 36
37 private: 37 private:
38 void StartImport(const importer::SourceProfile& source_profile, 38 void StartImport(const importer::SourceProfile& source_profile,
39 uint16_t imported_items); 39 uint16_t imported_items);
40 40
41 void ImportData(const base::ListValue* args); 41 void ImportData(const base::ListValue* args);
42 void Close(const base::ListValue* args);
42 43
43 void InitializeDialog(const base::ListValue* args); 44 void InitializeDialog(const base::ListValue* args);
44 void SendBrowserProfileData(const std::string& callback_id); 45 void SendBrowserProfileData(const std::string& callback_id);
45 46
46 // importer::ImporterProgressObserver: 47 // importer::ImporterProgressObserver:
47 void ImportStarted() override; 48 void ImportStarted() override;
48 void ImportItemStarted(importer::ImportItem item) override; 49 void ImportItemStarted(importer::ImportItem item) override;
49 void ImportItemEnded(importer::ImportItem item) override; 50 void ImportItemEnded(importer::ImportItem item) override;
50 void ImportEnded() override; 51 void ImportEnded() override;
51 52
(...skipping 14 matching lines...) Expand all
66 bool import_did_succeed_; 67 bool import_did_succeed_;
67 68
68 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 69 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
69 70
70 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler); 71 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
71 }; 72 };
72 73
73 } // namespace settings 74 } // namespace settings
74 75
75 #endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_ 76 #endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_IMPORT_DATA_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698