Commit 9a204a18 authored by ben's avatar ben Committed by Commit bot

Remove unnecessary method from Browser object.

TBR=sky@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1136363002

Cr-Commit-Position: refs/heads/master@{#329585}
parent c2f5fb08
...@@ -21,18 +21,13 @@ Browser::Browser() ...@@ -21,18 +21,13 @@ Browser::Browser()
content_(nullptr), content_(nullptr),
omnibox_(nullptr), omnibox_(nullptr),
navigator_host_(this), navigator_host_(this),
ui_(nullptr), ui_(nullptr) {
weak_factory_(this) {
exposed_services_impl_.AddService(this); exposed_services_impl_.AddService(this);
} }
Browser::~Browser() { Browser::~Browser() {
} }
base::WeakPtr<Browser> Browser::GetWeakPtr() {
return weak_factory_.GetWeakPtr();
}
void Browser::ReplaceContentWithURL(const mojo::String& url) { void Browser::ReplaceContentWithURL(const mojo::String& url) {
Embed(url, nullptr, nullptr); Embed(url, nullptr, nullptr);
} }
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef MANDOLINE_UI_BROWSER_BROWSER_H_ #ifndef MANDOLINE_UI_BROWSER_BROWSER_H_
#define MANDOLINE_UI_BROWSER_BROWSER_H_ #define MANDOLINE_UI_BROWSER_BROWSER_H_
#include "base/memory/weak_ptr.h"
#include "components/view_manager/public/cpp/view_manager.h" #include "components/view_manager/public/cpp/view_manager.h"
#include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/view_manager/public/cpp/view_manager_delegate.h"
#include "components/window_manager/window_manager_app.h" #include "components/window_manager/window_manager_app.h"
...@@ -34,8 +33,6 @@ class Browser : public mojo::ApplicationDelegate, ...@@ -34,8 +33,6 @@ class Browser : public mojo::ApplicationDelegate,
Browser(); Browser();
~Browser() override; ~Browser() override;
base::WeakPtr<Browser> GetWeakPtr();
void ReplaceContentWithURL(const mojo::String& url); void ReplaceContentWithURL(const mojo::String& url);
mojo::View* content() { return content_; } mojo::View* content() { return content_; }
...@@ -95,8 +92,6 @@ class Browser : public mojo::ApplicationDelegate, ...@@ -95,8 +92,6 @@ class Browser : public mojo::ApplicationDelegate,
scoped_ptr<BrowserUI> ui_; scoped_ptr<BrowserUI> ui_;
base::WeakPtrFactory<Browser> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(Browser); DISALLOW_COPY_AND_ASSIGN(Browser);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment