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

give member variables trailing _

Browse source 
- also, reorder member variables to come after methods
This commit is contained in:
Patrick Reynolds 2013-11-15 22:22:25 -06:00
parent 7e1a4003df
commit a18842de1a
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

62
brightray/browser/linux/inspectable_web_contents_view_linux.cc
View file

@ -15,11 +15,11 @@ InspectableWebContentsView* CreateInspectableContentsView(InspectableWebContents
} }
InspectableWebContentsViewLinux::InspectableWebContentsViewLinux(InspectableWebContentsImpl* inspectable_web_contents) InspectableWebContentsViewLinux::InspectableWebContentsViewLinux(InspectableWebContentsImpl* inspectable_web_contents)
: inspectable_web_contents_(inspectable_web_contents), devtools_window(NULL) { : inspectable_web_contents_(inspectable_web_contents), devtools_window_(NULL) {
} }
InspectableWebContentsViewLinux::~InspectableWebContentsViewLinux() { InspectableWebContentsViewLinux::~InspectableWebContentsViewLinux() {
if (devtools_window) gtk_widget_destroy(devtools_window); if (devtools_window_) gtk_widget_destroy(devtools_window_);
} }
#if 0 // some utility functions to debug GTK window hierarchies #if 0 // some utility functions to debug GTK window hierarchies
@ -72,14 +72,14 @@ gfx::NativeView InspectableWebContentsViewLinux::GetNativeView() const {
into the unassigned state. into the unassigned state.
ShowDevTools() and is responsible for transitioning from any one of these ShowDevTools() and is responsible for transitioning from any one of these
states to the three visible states, 2-4, as indicated by the contents of the states to the three visible states, 2-4, as indicated by the contents of the
'dockside' variable. The helper functions ShowDevToolsInWindow and 'dockside_' variable. The helper functions ShowDevToolsInWindow and
ShowDevToolsInPane focus on transitioning to states 2 and 3+4, respectively. ShowDevToolsInPane focus on transitioning to states 2 and 3+4, respectively.
These helper functions are responsible for the entire transition, including These helper functions are responsible for the entire transition, including
cleaning up any extraneous containers from the old state. cleaning up any extraneous containers from the old state.
Hiding the dev tools is taken care of by CloseDevTools (from paned states Hiding the dev tools is taken care of by CloseDevTools (from paned states
3+4 to invisible state 5) or by the "delete-event" signal on the 3+4 to invisible state 5) or by the "delete-event" signal on the
devtools_window (from window state 2 to 5). devtools_window_ (from window state 2 to 5).
Remember that GTK does reference counting, so a view with no refs and no Remember that GTK does reference counting, so a view with no refs and no
parent will be freed. Views that have a ref but no parents will lose their parent will be freed. Views that have a ref but no parents will lose their
@ -94,18 +94,18 @@ void InspectableWebContentsViewLinux::ShowDevTools() {
GtkWidget *parent = gtk_widget_get_parent(devtools); GtkWidget *parent = gtk_widget_get_parent(devtools);
DLOG(INFO) << base::StringPrintf("InspectableWebContentsViewLinux::ShowDevTools - parent=%s@%p window=%p dockside=\"%s\"", DLOG(INFO) << base::StringPrintf("InspectableWebContentsViewLinux::ShowDevTools - parent=%s@%p window=%p dockside=\"%s\"",
g_type_name_from_instance((GTypeInstance*)parent), parent, devtools_window, dockside.c_str()); g_type_name_from_instance((GTypeInstance*)parent), parent, devtools_window_, dockside_.c_str());
if (!parent || GTK_IS_PANED(parent)) { if (!parent || GTK_IS_PANED(parent)) {
if (dockside == "undocked") ShowDevToolsInWindow(); if (dockside_ == "undocked") ShowDevToolsInWindow();
else if (dockside == "bottom") ShowDevToolsInPane(true); else if (dockside_ == "bottom") ShowDevToolsInPane(true);
else if (dockside == "right") ShowDevToolsInPane(false); else if (dockside_ == "right") ShowDevToolsInPane(false);
} }
else { else {
DCHECK(parent == devtools_window); DCHECK(parent == devtools_window_);
if (dockside == "undocked") gtk_widget_show_all(parent); if (dockside_ == "undocked") gtk_widget_show_all(parent);
else if (dockside == "bottom") ShowDevToolsInPane(true); else if (dockside_ == "bottom") ShowDevToolsInPane(true);
else if (dockside == "right") ShowDevToolsInPane(false); else if (dockside_ == "right") ShowDevToolsInPane(false);
} }
} }
@ -114,7 +114,7 @@ void InspectableWebContentsViewLinux::CloseDevTools() {
GtkWidget *parent = gtk_widget_get_parent(devtools); GtkWidget *parent = gtk_widget_get_parent(devtools);
DLOG(INFO) << base::StringPrintf("InspectableWebContentsViewLinux::CloseDevTools - parent=%s@%p window=%p dockside=\"%s\"", DLOG(INFO) << base::StringPrintf("InspectableWebContentsViewLinux::CloseDevTools - parent=%s@%p window=%p dockside=\"%s\"",
g_type_name_from_instance((GTypeInstance*)parent), parent, devtools_window, dockside.c_str()); g_type_name_from_instance((GTypeInstance*)parent), parent, devtools_window_, dockside_.c_str());
if (!parent) { if (!parent) {
return; // Not visible -> nothing to do return; // Not visible -> nothing to do
@ -123,15 +123,15 @@ void InspectableWebContentsViewLinux::CloseDevTools() {
GtkWidget *browser = GetBrowserWindow(); GtkWidget *browser = GetBrowserWindow();
GtkWidget *view = GetNativeView(); GtkWidget *view = GetNativeView();
if (!devtools_window) MakeDevToolsWindow(); if (!devtools_window_) MakeDevToolsWindow();
gtk_widget_reparent(devtools, devtools_window); gtk_widget_reparent(devtools, devtools_window_);
g_object_ref(parent); g_object_ref(parent);
gtk_container_remove(GTK_CONTAINER(browser), parent); gtk_container_remove(GTK_CONTAINER(browser), parent);
gtk_widget_reparent(view, browser); gtk_widget_reparent(view, browser);
g_object_unref(parent); g_object_unref(parent);
} }
else { else {
DCHECK(parent == devtools_window); DCHECK(parent == devtools_window_);
gtk_widget_hide(parent); gtk_widget_hide(parent);
} }
} }
@ -139,9 +139,9 @@ void InspectableWebContentsViewLinux::CloseDevTools() {
bool InspectableWebContentsViewLinux::SetDockSide(const std::string& side) { bool InspectableWebContentsViewLinux::SetDockSide(const std::string& side) {
DLOG(INFO) << "InspectableWebContentsViewLinux::SetDockSide: \"" << side << "\""; DLOG(INFO) << "InspectableWebContentsViewLinux::SetDockSide: \"" << side << "\"";
if (side != "undocked" && side != "bottom" && side != "right") return false; // unsupported display location if (side != "undocked" && side != "bottom" && side != "right") return false; // unsupported display location
if (dockside == side) return true; // no change from current location if (dockside_ == side) return true; // no change from current location
dockside = side; dockside_ = side;
// If devtools already has a parent, then we're being asked to move it. // If devtools already has a parent, then we're being asked to move it.
GtkWidget *devtools = inspectable_web_contents()->devtools_web_contents()->GetView()->GetNativeView(); GtkWidget *devtools = inspectable_web_contents()->devtools_web_contents()->GetView()->GetNativeView();
@ -156,13 +156,13 @@ void InspectableWebContentsViewLinux::ShowDevToolsInWindow() {
GtkWidget *devtools = inspectable_web_contents()->devtools_web_contents()->GetView()->GetNativeView(); GtkWidget *devtools = inspectable_web_contents()->devtools_web_contents()->GetView()->GetNativeView();
GtkWidget *parent = gtk_widget_get_parent(devtools); GtkWidget *parent = gtk_widget_get_parent(devtools);
if (!devtools_window) MakeDevToolsWindow(); if (!devtools_window_) MakeDevToolsWindow();
if (!parent) { if (!parent) {
gtk_container_add(GTK_CONTAINER(devtools_window), devtools); gtk_container_add(GTK_CONTAINER(devtools_window_), devtools);
} }
else if (parent != devtools_window) { else if (parent != devtools_window_) {
DCHECK(GTK_IS_PANED(parent)); DCHECK(GTK_IS_PANED(parent));
gtk_widget_reparent(devtools, devtools_window); gtk_widget_reparent(devtools, devtools_window_);
// Remove the pane. // Remove the pane.
GtkWidget *view = GetNativeView(); GtkWidget *view = GetNativeView();
@ -173,15 +173,15 @@ void InspectableWebContentsViewLinux::ShowDevToolsInWindow() {
gtk_container_add(GTK_CONTAINER(browser), view); gtk_container_add(GTK_CONTAINER(browser), view);
g_object_unref(view); g_object_unref(view);
} }
gtk_widget_show_all(devtools_window); gtk_widget_show_all(devtools_window_);
} }
void InspectableWebContentsViewLinux::MakeDevToolsWindow() { void InspectableWebContentsViewLinux::MakeDevToolsWindow() {
DCHECK(!devtools_window); DCHECK(!devtools_window_);
devtools_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); devtools_window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(devtools_window), "Developer Tools"); gtk_window_set_title(GTK_WINDOW(devtools_window_), "Developer Tools");
gtk_window_set_default_size(GTK_WINDOW(devtools_window), 800, 600); gtk_window_set_default_size(GTK_WINDOW(devtools_window_), 800, 600);
g_signal_connect(GTK_OBJECT(devtools_window), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), this); g_signal_connect(GTK_OBJECT(devtools_window_), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), this);
} }
void InspectableWebContentsViewLinux::ShowDevToolsInPane(bool on_bottom) { void InspectableWebContentsViewLinux::ShowDevToolsInPane(bool on_bottom) {
@ -213,14 +213,14 @@ void InspectableWebContentsViewLinux::ShowDevToolsInPane(bool on_bottom) {
gtk_container_remove(GTK_CONTAINER(browser), parent); gtk_container_remove(GTK_CONTAINER(browser), parent);
} }
else { else {
DCHECK(parent == devtools_window); DCHECK(parent == devtools_window_);
g_object_ref(view); g_object_ref(view);
gtk_container_remove(GTK_CONTAINER(devtools_window), devtools); gtk_container_remove(GTK_CONTAINER(devtools_window_), devtools);
gtk_container_remove(GTK_CONTAINER(browser), view); gtk_container_remove(GTK_CONTAINER(browser), view);
gtk_paned_add1(GTK_PANED(pane), view); gtk_paned_add1(GTK_PANED(pane), view);
gtk_paned_add2(GTK_PANED(pane), devtools); gtk_paned_add2(GTK_PANED(pane), devtools);
g_object_unref(view); g_object_unref(view);
gtk_widget_hide(devtools_window); gtk_widget_hide(devtools_window_);
} }
gtk_container_add(GTK_CONTAINER(browser), pane); gtk_container_add(GTK_CONTAINER(browser), pane);
gtk_widget_show_all(pane); gtk_widget_show_all(pane);

40
brightray/browser/linux/inspectable_web_contents_view_linux.h
View file

@ -22,29 +22,29 @@ public:
InspectableWebContentsImpl* inspectable_web_contents() { return inspectable_web_contents_; } InspectableWebContentsImpl* inspectable_web_contents() { return inspectable_web_contents_; }
private: private:
// Show the dev tools in their own window. If they're already shown
// somewhere else, remove them cleanly and take any GtkPaned out of the
// window.
void ShowDevToolsInWindow();
// Show the dev tools in a vpaned (on the bottom) or hpaned (on the
// right). If they're already shown in a pane, move them and remove the
// old pane. If they're already shown in a window, hide (don't delete)
// that window.
void ShowDevToolsInPane(bool on_bottom);
// Create a new window for dev tools. This function doesn't actually
// put the dev tools in the window or show the window.
void MakeDevToolsWindow();
// Get the GtkWindow* that contains this object.
GtkWidget *GetBrowserWindow();
// Owns us. // Owns us.
InspectableWebContentsImpl* inspectable_web_contents_; InspectableWebContentsImpl* inspectable_web_contents_;
std::string dockside; std::string dockside_;
GtkWidget *devtools_window; GtkWidget *devtools_window_;
// Show the dev tools in their own window. If they're already shown
// somewhere else, remove them cleanly and take any GtkPaned out of the
// window.
void ShowDevToolsInWindow();
// Show the dev tools in a vpaned (on the bottom) or hpaned (on the
// right). If they're already shown in a pane, move them and remove the
// old pane. If they're already shown in a window, hide (don't delete)
// that window.
void ShowDevToolsInPane(bool on_bottom);
// Create a new window for dev tools. This function doesn't actually
// put the dev tools in the window or show the window.
void MakeDevToolsWindow();
// Get the GtkWindow* that contains this object.
GtkWidget *GetBrowserWindow();
DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewLinux); DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewLinux);
}; };