Restructure contents of blimp/client.

blimp/client/android/toolbar.h

Index: blimp/client/android/toolbar.h
diff --git a/blimp/client/android/toolbar.h b/blimp/client/android/toolbar.h
deleted file mode 100644
index 620be94e8ac51482f8c9f462c1b0861215a04f55..0000000000000000000000000000000000000000
--- a/blimp/client/android/toolbar.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2015 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.
-
-#ifndef BLIMP_CLIENT_ANDROID_TOOLBAR_H_
-#define BLIMP_CLIENT_ANDROID_TOOLBAR_H_
-
-#include "base/android/jni_android.h"
-#include "base/macros.h"
-#include "blimp/client/session/navigation_feature.h"
-
-class GURL;
-class SkBitmap;
-
-namespace blimp {
-namespace client {
-
-// The native component of org.chromium.blimp.toolbar.Toolbar.  This handles
-// marshalling calls between Java and native.  Specifically, this passes calls
-// between Toolbar.java <=> NavigationFeature.
-class Toolbar : public NavigationFeature::NavigationFeatureDelegate {
- public:
-  static bool RegisterJni(JNIEnv* env);
-
-  Toolbar(JNIEnv* env,
-          const base::android::JavaParamRef<jobject>& jobj,
-          NavigationFeature* navigation_feature);
-
-  // Methods called from Java via JNI.
-  void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj);
-  void OnUrlTextEntered(JNIEnv* env,
-                        const base::android::JavaParamRef<jobject>& jobj,
-                        const base::android::JavaParamRef<jstring>& text);
-  void OnReloadPressed(JNIEnv* env,
-                       const base::android::JavaParamRef<jobject>& jobj);
-  void OnForwardPressed(JNIEnv* env,
-                        const base::android::JavaParamRef<jobject>& jobj);
-  jboolean OnBackPressed(JNIEnv* env,
-                         const base::android::JavaParamRef<jobject>& jobj);
-
-  // NavigationFeatureDelegate implementation.
-  void OnUrlChanged(int tab_id, const GURL& url) override;
-  void OnFaviconChanged(int tab_id, const SkBitmap& favicon) override;
-  void OnTitleChanged(int tab_id, const std::string& title) override;
-  void OnLoadingChanged(int tab_id, bool loading) override;
-
- private:
-  virtual ~Toolbar();
-
-  // A bridge to the network layer which does the work of (de)serializing the
-  // outgoing and incoming navigation messages from the engine. Toolbar does not
-  // own this and it is expected to outlive this Toolbar instance.
-  NavigationFeature* navigation_feature_;
-
-  // Reference to the Java object which owns this class.
-  base::android::ScopedJavaGlobalRef<jobject> java_obj_;
-
-  DISALLOW_COPY_AND_ASSIGN(Toolbar);
-};
-
-}  // namespace client
-}  // namespace blimp
-
-#endif  // BLIMP_CLIENT_ANDROID_TOOLBAR_H_