VR: Use ToolbarModel to drive VR URL bar state.

chrome/browser/android/vr_shell/toolbar_helper.cc

Index: chrome/browser/android/vr_shell/toolbar_helper.cc
diff --git a/chrome/browser/android/vr_shell/toolbar_helper.cc b/chrome/browser/android/vr_shell/toolbar_helper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8513bc3a089688fca2540d07fc69944d1c5f5cbe
--- /dev/null
+++ b/chrome/browser/android/vr_shell/toolbar_helper.cc
@@ -0,0 +1,39 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/android/vr_shell/toolbar_helper.h"
+
+#include "base/memory/ptr_util.h"
+#include "components/toolbar/toolbar_model_impl.h"
+
+class ToolbarModelDelegate;
+
+namespace vr_shell {
+
+namespace {
+constexpr int kMaxURLDisplayChars = 1024;

[mthiesse, 2017/06/28 00:27:08]

Why 1024? Do we intend for the URL to never get truncated by the
ToolbarModelImpl?

[cjgrant, 2017/06/28 15:14:34]

ToolbarModelImpl can truncate, that's fine.  The constant used in content is
32K.  If we limit to 1K, that's still 10 times more URL that we can fit on our
bar, and our rendering will further truncate.  Is this what you meant?

[mthiesse, 2017/06/28 15:46:41]

1K just seems strange. I was wondering if we were trying to make sure truncating
only happens once. Maybe put a comment on why 1K? If it's arbitrary, that's
probably fine, but we should note that :P

[cjgrant, 2017/06/28 19:41:51]

Is it less strange than 32K that desktop uses?  :)  I'm actually just trying to
avoid linking in another chunk of content to pick up a constant.

[mthiesse, 2017/06/28 19:50:13]

I'm just asking for a comment saying "This is arbitrary", so future readers
don't assume it has to be 1024.

[cjgrant, 2017/06/28 20:21:02]

SGTM.  Done.

+}
+
+ToolbarHelper::ToolbarHelper(UiInterface* ui, ToolbarModelDelegate* delegate)
+    : ui_(ui),
+      toolbar_model_(
+          base::MakeUnique<ToolbarModelImpl>(delegate, kMaxURLDisplayChars)) {}
+
+ToolbarHelper::~ToolbarHelper() {}
+
+void ToolbarHelper::Update() {
+  ToolbarState state;
+  state.gurl = toolbar_model_->GetURL();
+  state.security_level = toolbar_model_->GetSecurityLevel(true);
+  state.vector_icon = &(toolbar_model_->GetVectorIcon());

[mthiesse, 2017/06/28 00:27:08]

nit: unnecessary parens

[cjgrant, 2017/06/28 15:14:33]

Done.

+  state.secure_verbose_text = toolbar_model_->GetSecureVerboseText();
+  state.should_display_url = toolbar_model_->ShouldDisplayURL();
+
+  if (current_state_ == state)
+    return;
+  current_state_ = state;
+  ui_->SetToolbarState(state);
+}
+
+}  // namespace vr_shell