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

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

Issue 24345002: Do not add "Bookmarks File" to ImporterList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 7 years, 2 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 #include "chrome/browser/ui/webui/options/import_data_handler.h" 5 #include "chrome/browser/ui/webui/options/import_data_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 }; 66 };
67 67
68 RegisterStrings(localized_strings, resources, arraysize(resources)); 68 RegisterStrings(localized_strings, resources, arraysize(resources));
69 RegisterTitle(localized_strings, "importDataOverlay", 69 RegisterTitle(localized_strings, "importDataOverlay",
70 IDS_IMPORT_SETTINGS_TITLE); 70 IDS_IMPORT_SETTINGS_TITLE);
71 } 71 }
72 72
73 void ImportDataHandler::InitializeHandler() { 73 void ImportDataHandler::InitializeHandler() {
74 importer_list_ = new ImporterList(); 74 importer_list_ = new ImporterList();
75 importer_list_->DetectSourceProfiles( 75 importer_list_->DetectSourceProfiles(
76 g_browser_process->GetApplicationLocale(), this); 76 g_browser_process->GetApplicationLocale(), true, this);
77 } 77 }
78 78
79 void ImportDataHandler::RegisterMessages() { 79 void ImportDataHandler::RegisterMessages() {
80 web_ui()->RegisterMessageCallback( 80 web_ui()->RegisterMessageCallback(
81 "importData", 81 "importData",
82 base::Bind(&ImportDataHandler::ImportData, base::Unretained(this))); 82 base::Bind(&ImportDataHandler::ImportData, base::Unretained(this)));
83 web_ui()->RegisterMessageCallback( 83 web_ui()->RegisterMessageCallback(
84 "chooseBookmarksFile", 84 "chooseBookmarksFile",
85 base::Bind(&ImportDataHandler::HandleChooseBookmarksFile, 85 base::Bind(&ImportDataHandler::HandleChooseBookmarksFile,
86 base::Unretained(this))); 86 base::Unretained(this)));
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 base::string16(), 242 base::string16(),
243 base::FilePath(), 243 base::FilePath(),
244 &file_type_info, 244 &file_type_info,
245 0, 245 0,
246 base::FilePath::StringType(), 246 base::FilePath::StringType(),
247 browser->window()->GetNativeWindow(), 247 browser->window()->GetNativeWindow(),
248 NULL); 248 NULL);
249 } 249 }
250 250
251 } // namespace options 251 } // namespace options
OLDNEW
« chrome/browser/importer/importer_list.h ('K') | « chrome/browser/importer/importer_list.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698