summaryrefslogtreecommitdiffstats
path: root/pdf/out_of_process_instance.cc
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2015-09-09 18:02:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-10 01:03:17 +0000
commit8872f4fd0f5075bd7cce282a5f665fdd2efc2116 (patch)
tree28f58003348700bfb8b6966f93aeb39f429ea643 /pdf/out_of_process_instance.cc
parent07f54ff2f8ce9fa75820d6e677d2b151896edfd3 (diff)
downloadchromium_src-8872f4fd0f5075bd7cce282a5f665fdd2efc2116.zip
chromium_src-8872f4fd0f5075bd7cce282a5f665fdd2efc2116.tar.gz
chromium_src-8872f4fd0f5075bd7cce282a5f665fdd2efc2116.tar.bz2
PDF: Strip whitespace when determining whether a PDF's title is empty.
Currently, if a PDF title contains only whitespace, that whitespace-only title is displayed in the UI instead of the last path component. With this change, a title containing only whitespace is ignored just as an empty title is. BUG=527309 Review URL: https://codereview.chromium.org/1316873006 Cr-Commit-Position: refs/heads/master@{#348061}
Diffstat (limited to 'pdf/out_of_process_instance.cc')
-rw-r--r--pdf/out_of_process_instance.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index 2e62e8b..6ab52be 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/content_restriction.h"
#include "net/base/escape.h"
@@ -1131,7 +1132,7 @@ void OutOfProcessInstance::DocumentLoadComplete(int page_count) {
pp::VarDictionary metadata_message;
metadata_message.Set(pp::Var(kType), pp::Var(kJSMetadataType));
std::string title = engine_->GetMetadata("Title");
- if (!title.empty())
+ if (!base::TrimWhitespace(base::UTF8ToUTF16(title), base::TRIM_ALL).empty())
metadata_message.Set(pp::Var(kJSTitle), pp::Var(title));
metadata_message.Set(pp::Var(kJSBookmarks), engine_->GetBookmarks());