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/importer/external_process_importer_client.cc

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 4 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 (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/importer/external_process_importer_client.h" 5 #include "chrome/browser/importer/external_process_importer_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 cancelled_ = true; 56 cancelled_ = true;
57 BrowserThread::PostTask( 57 BrowserThread::PostTask(
58 BrowserThread::IO, FROM_HERE, 58 BrowserThread::IO, FROM_HERE,
59 base::Bind( 59 base::Bind(
60 &ExternalProcessImporterClient::CancelImportProcessOnIOThread, 60 &ExternalProcessImporterClient::CancelImportProcessOnIOThread,
61 this)); 61 this));
62 Release(); 62 Release();
63 } 63 }
64 64
65 void ExternalProcessImporterClient::OnProcessCrashed(int exit_code) { 65 void ExternalProcessImporterClient::OnProcessCrashed(int exit_code) {
66 DLOG(ERROR) << __FUNCTION__; 66 DLOG(ERROR) << __func__;
67 if (cancelled_) 67 if (cancelled_)
68 return; 68 return;
69 69
70 // If the host is still around, cancel the import; otherwise it means the 70 // If the host is still around, cancel the import; otherwise it means the
71 // import was already cancelled or completed and this message can be dropped. 71 // import was already cancelled or completed and this message can be dropped.
72 if (process_importer_host_.get()) 72 if (process_importer_host_.get())
73 process_importer_host_->Cancel(); 73 process_importer_host_->Cancel();
74 } 74 }
75 75
76 bool ExternalProcessImporterClient::OnMessageReceived( 76 bool ExternalProcessImporterClient::OnMessageReceived(
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 localized_strings.SetString( 347 localized_strings.SetString(
348 base::IntToString(IDS_IMPORT_FROM_SAFARI), 348 base::IntToString(IDS_IMPORT_FROM_SAFARI),
349 l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI)); 349 l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI));
350 localized_strings.SetString( 350 localized_strings.SetString(
351 base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME), 351 base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME),
352 l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME)); 352 l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME));
353 353
354 utility_process_host_->Send(new ProfileImportProcessMsg_StartImport( 354 utility_process_host_->Send(new ProfileImportProcessMsg_StartImport(
355 source_profile_, items_, localized_strings)); 355 source_profile_, items_, localized_strings));
356 } 356 }
OLDNEW
« no previous file with comments | « chrome/browser/image_holder.cc ('k') | chrome/browser/media/router/presentation_service_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698