Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5981)

Unified Diff: chrome/browser/ui/gtk/apps/native_app_window_gtk.h

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, nits (rename) Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/apps/native_app_window_gtk.h
diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.h b/chrome/browser/ui/gtk/apps/native_app_window_gtk.h
index ac15a4e1553a189a0014b72526981c4ddadc47f1..6b4cc65c12b10710be7b447facf8670007efe85c 100644
--- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.h
+++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.h
@@ -7,7 +7,7 @@
#include <gtk/gtk.h>
-#include "apps/shell_window.h"
+#include "apps/app_window.h"
#include "apps/ui/native_app_window.h"
#include "base/observer_list.h"
#include "base/timer/timer.h"
@@ -30,8 +30,8 @@ class NativeAppWindowGtk : public apps::NativeAppWindow,
public ui::ActiveWindowWatcherXObserver,
public content::WebContentsObserver {
public:
- NativeAppWindowGtk(apps::ShellWindow* shell_window,
- const apps::ShellWindow::CreateParams& params);
+ NativeAppWindowGtk(apps::AppWindow* app_window,
+ const apps::AppWindow::CreateParams& params);
// ui::BaseWindow implementation.
virtual bool IsActive() const OVERRIDE;
@@ -95,10 +95,10 @@ class NativeAppWindowGtk : public apps::NativeAppWindow,
web_modal::ModalDialogHostObserver* observer) OVERRIDE;
content::WebContents* web_contents() const {
- return shell_window_->web_contents();
+ return app_window_->web_contents();
}
const extensions::Extension* extension() const {
- return shell_window_->extension();
+ return app_window_->extension();
}
virtual ~NativeAppWindowGtk();
@@ -124,7 +124,7 @@ class NativeAppWindowGtk : public apps::NativeAppWindow,
void OnConfigureDebounced();
- apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
+ apps::AppWindow* app_window_; // weak - AppWindow owns NativeAppWindow.
GtkWindow* window_;
GdkWindowState state_;
« no previous file with comments | « chrome/browser/ui/gtk/apps/chrome_shell_window_delegate_gtk.cc ('k') | chrome/browser/ui/gtk/apps/native_app_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698