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

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

Issue 161753002: Move Windows-specific code into NativeAppWindowViewsWin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 17ec74967aff344167b0b81a2c687b197dae3b35..11314a7798a606d5c928efb2be835274f215e03b 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,6 +5,7 @@
#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 "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
@@ -16,14 +17,23 @@ class NativeAppWindowViewsWin : public NativeAppWindowViews {
private:
void ActivateParentDesktopIfNecessary();
+ 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;
+ virtual void InitializeDefaultWindow(
+ const apps::ShellWindow::CreateParams& create_params) OVERRIDE;
// Overridden from ui::BaseWindow:
virtual void Show() OVERRIDE;
virtual void Activate() OVERRIDE;
+ base::WeakPtrFactory<NativeAppWindowViewsWin> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViewsWin);
};
« 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