chrome/browser/ui/webui/options2/import_data_handler.h - Issue 10698140: Remove "2" suffixes from options2 code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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 | Annotate | Revision Log

OLD	NEW
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_OPTIONS2_IMPORT_DATA_HANDLER2_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_

6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_	6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

11 #include "base/memory/ref_counted.h"	11 #include "base/memory/ref_counted.h"

12 #include "chrome/browser/importer/importer_data_types.h"	12 #include "chrome/browser/importer/importer_data_types.h"

13 #include "chrome/browser/importer/importer_list_observer.h"	13 #include "chrome/browser/importer/importer_list_observer.h"

14 #include "chrome/browser/importer/importer_progress_observer.h"	14 #include "chrome/browser/importer/importer_progress_observer.h"

15 #include "chrome/browser/ui/webui/options2/options_ui2.h"	15 #include "chrome/browser/ui/webui/options2/options_ui.h"

16	16

17 class ImporterHost;	17 class ImporterHost;

18 class ImporterList;	18 class ImporterList;

19	19

20 namespace options2 {	20 namespace options2 {

21	21

22 // Chrome personal stuff import data overlay UI handler.	22 // Chrome personal stuff import data overlay UI handler.

23 class ImportDataHandler : public OptionsPageUIHandler,	23 class ImportDataHandler : public OptionsPageUIHandler,

24 public importer::ImporterListObserver,	24 public importer::ImporterListObserver,

25 public importer::ImporterProgressObserver {	25 public importer::ImporterProgressObserver {

(...skipping 28 matching lines...) Expand all Loading...
54 // of deleting itself when import is complete.	54 // of deleting itself when import is complete.

55 ImporterHost* importer_host_; // weak	55 ImporterHost* importer_host_; // weak

56	56

57 bool import_did_succeed_;	57 bool import_did_succeed_;

58	58

59 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);	59 DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);

60 };	60 };

61	61

62 } // namespace options2	62 } // namespace options2

63	63

64 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_	64 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_

OLD	NEW