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

Side by Side Diff: chrome/browser/importer/importer_bridge.h

Issue 2715006: Fix import crash in Mac 10.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/importer/importer_bridge.cc » ('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 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
6 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_ 6 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/ref_counted.h" 13 #include "base/ref_counted.h"
14 #include "base/scoped_ptr.h"
14 #include "base/string16.h" 15 #include "base/string16.h"
15 #include "chrome/browser/chrome_thread.h" 16 #include "chrome/browser/chrome_thread.h"
16 #include "chrome/browser/importer/importer_data_types.h" 17 #include "chrome/browser/importer/importer_data_types.h"
17 // TODO: remove this, see friend declaration in ImporterBridge. 18 // TODO: remove this, see friend declaration in ImporterBridge.
18 #include "chrome/browser/importer/toolbar_importer.h" 19 #include "chrome/browser/importer/toolbar_importer.h"
19 20
20 class ProfileImportThread; 21 class ProfileImportThread;
21 class DictionaryValue; 22 class DictionaryValue;
22 class ImporterHost; 23 class ImporterHost;
23 24
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 virtual std::wstring GetLocalizedString(int message_id); 153 virtual std::wstring GetLocalizedString(int message_id);
153 154
154 private: 155 private:
155 ~ExternalProcessImporterBridge() {} 156 ~ExternalProcessImporterBridge() {}
156 157
157 // Call back to send data and messages across IPC. 158 // Call back to send data and messages across IPC.
158 ProfileImportThread* const profile_import_thread_; 159 ProfileImportThread* const profile_import_thread_;
159 160
160 // Holds strings needed by the external importer because the resource 161 // Holds strings needed by the external importer because the resource
161 // bundle isn't available to the external process. 162 // bundle isn't available to the external process.
162 const DictionaryValue& localized_strings_; 163 scoped_ptr<DictionaryValue> localized_strings_;
163 164
164 DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge); 165 DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
165 }; 166 };
166 167
167 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_ 168 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/importer/importer_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698