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

Unified Diff: chrome/browser/ui/views/apps/native_app_window_views_win.h

Issue 171523005: BACKUP: NativeAppWindowView - before splitting CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/views/apps/native_app_window_views_win.h
diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.h b/chrome/browser/ui/views/apps/native_app_window_views_win.h
index ebcfa17ae9a59fb6a9b8ac78649cd8eb90912441..1cdd112a9945e4b649127c2e7555d478db8db488 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views_win.h
+++ b/chrome/browser/ui/views/apps/native_app_window_views_win.h
@@ -5,14 +5,14 @@
#ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_WIN_H_
#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_WIN_H_
+#include "apps/ui/views/native_app_window_views.h"
#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/views/apps/native_app_window_views.h"
// Windows-specific parts of the views-backed native shell window implementation
// for packaged apps.
-class NativeAppWindowViewsWin : public NativeAppWindowViews {
+class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
public:
- NativeAppWindowViewsWin();
+ ChromeNativeAppWindowViewsWin();
private:
void ActivateParentDesktopIfNecessary();
@@ -20,8 +20,6 @@ class NativeAppWindowViewsWin : public NativeAppWindowViews {
void OnShortcutInfoLoaded(
const ShellIntegration::ShortcutInfo& shortcut_info);
- HWND GetNativeAppWindowHWND() const;
-
// Overridden from NativeAppWindowViews:
virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
views::Widget* widget) OVERRIDE;
@@ -32,9 +30,9 @@ class NativeAppWindowViewsWin : public NativeAppWindowViews {
virtual void Show() OVERRIDE;
virtual void Activate() OVERRIDE;
- base::WeakPtrFactory<NativeAppWindowViewsWin> weak_ptr_factory_;
+ base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViewsWin);
+ DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
};
#endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_WIN_H_
« no previous file with comments | « chrome/browser/ui/views/apps/native_app_window_views.cc ('k') | chrome/browser/ui/views/apps/native_app_window_views_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698