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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.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/cocoa/apps/native_app_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index b0f6775dbdc5b3876c568892c2b799d45a689f35..9f05cc0c2ef4b56fc65d069b42e2252c19534d8d 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include <vector>
-#include "apps/shell_window.h"
+#include "apps/app_window.h"
#include "apps/ui/native_app_window.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
@@ -43,8 +43,8 @@ class SkRegion;
class NativeAppWindowCocoa : public apps::NativeAppWindow,
public content::WebContentsObserver {
public:
- NativeAppWindowCocoa(apps::ShellWindow* shell_window,
- const apps::ShellWindow::CreateParams& params);
+ NativeAppWindowCocoa(apps::AppWindow* app_window,
+ const apps::AppWindow::CreateParams& params);
// ui::BaseWindow implementation.
virtual bool IsActive() const OVERRIDE;
@@ -155,10 +155,10 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
ShellNSWindow* window() const;
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();
}
// Returns the WindowStyleMask based on the type of window frame.
@@ -182,7 +182,7 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
// Hides the window unconditionally. Used by Hide and HideWithApp.
void HideWithoutMarkingHidden();
- apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
+ apps::AppWindow* app_window_; // weak - AppWindow owns NativeAppWindow.
bool has_frame_;

Powered by Google App Engine
This is Rietveld 408576698