mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move title_ to InspectableWebContentsViewVies to get rid of cast.

Browse source
This commit is contained in:
Haojian Wu 2017-04-01 14:56:51 +02:00
parent ee1f3acf7b
commit e80a9bbb93
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
brightray/browser/views/inspectable_web_contents_view_views.cc
View file

@ -24,8 +24,7 @@ class DevToolsWindowDelegate : public views::ClientView,
: views::ClientView(widget, view), : views::ClientView(widget, view),
shell_(shell), shell_(shell),
view_(view), view_(view),
widget_(widget), widget_(widget) {
title_(base::ASCIIToUTF16("Developer Tools")) {
// A WidgetDelegate should be deleted on DeleteDelegate. // A WidgetDelegate should be deleted on DeleteDelegate.
set_owned_by_client(); set_owned_by_client();
@ -34,15 +33,13 @@ class DevToolsWindowDelegate : public views::ClientView,
} }
virtual ~DevToolsWindowDelegate() {} virtual ~DevToolsWindowDelegate() {}
void SetWindowTitle(const base::string16& title) { title_ = title; }
// views::WidgetDelegate: // views::WidgetDelegate:
void DeleteDelegate() override { delete this; } void DeleteDelegate() override { delete this; }
views::View* GetInitiallyFocusedView() override { return view_; } views::View* GetInitiallyFocusedView() override { return view_; }
bool CanResize() const override { return true; } bool CanResize() const override { return true; }
bool CanMaximize() const override { return true; } bool CanMaximize() const override { return true; }
bool CanMinimize() const override { return true; } bool CanMinimize() const override { return true; }
base::string16 GetWindowTitle() const override { return title_; } base::string16 GetWindowTitle() const override { return shell_->GetTitle(); }
gfx::ImageSkia GetWindowAppIcon() override { return GetWindowIcon(); } gfx::ImageSkia GetWindowAppIcon() override { return GetWindowIcon(); }
gfx::ImageSkia GetWindowIcon() override { return icon_; } gfx::ImageSkia GetWindowIcon() override { return icon_; }
views::Widget* GetWidget() override { return widget_; } views::Widget* GetWidget() override { return widget_; }
@ -62,7 +59,6 @@ class DevToolsWindowDelegate : public views::ClientView,
InspectableWebContentsViewViews* shell_; InspectableWebContentsViewViews* shell_;
views::View* view_; views::View* view_;
views::Widget* widget_; views::Widget* widget_;
base::string16 title_;
gfx::ImageSkia icon_; gfx::ImageSkia icon_;
DISALLOW_COPY_AND_ASSIGN(DevToolsWindowDelegate); DISALLOW_COPY_AND_ASSIGN(DevToolsWindowDelegate);
@ -82,7 +78,8 @@ InspectableWebContentsViewViews::InspectableWebContentsViewViews(
contents_web_view_(nullptr), contents_web_view_(nullptr),
devtools_web_view_(new views::WebView(nullptr)), devtools_web_view_(new views::WebView(nullptr)),
devtools_visible_(false), devtools_visible_(false),
devtools_window_delegate_(nullptr) { devtools_window_delegate_(nullptr),
title_(base::ASCIIToUTF16("Developer Tools")) {
set_owned_by_client(); set_owned_by_client();
if (inspectable_web_contents_->GetWebContents()->GetNativeView()) { if (inspectable_web_contents_->GetWebContents()->GetNativeView()) {
@ -203,8 +200,7 @@ void InspectableWebContentsViewViews::SetContentsResizingStrategy(
void InspectableWebContentsViewViews::SetTitle(const base::string16& title) { void InspectableWebContentsViewViews::SetTitle(const base::string16& title) {
if (devtools_window_) { if (devtools_window_) {
static_cast<DevToolsWindowDelegate*>(devtools_window_delegate_) title_ = title;
->SetWindowTitle(title);
devtools_window_->UpdateWindowTitle(); devtools_window_->UpdateWindowTitle();
} }
} }

3
brightray/browser/views/inspectable_web_contents_view_views.h
View file

@ -40,6 +40,8 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
return inspectable_web_contents_; return inspectable_web_contents_;
} }
const base::string16& GetTitle() const { return title_; }
private: private:
// views::View: // views::View:
void Layout() override; void Layout() override;
@ -55,6 +57,7 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
DevToolsContentsResizingStrategy strategy_; DevToolsContentsResizingStrategy strategy_;
bool devtools_visible_; bool devtools_visible_;
views::WidgetDelegate* devtools_window_delegate_; views::WidgetDelegate* devtools_window_delegate_;
base::string16 title_;
DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewViews); DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewViews);
}; };