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

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

Issue 158643002: Add option to install an ephemeral app to the Windows jump list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added notimplemented 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.h
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.h b/chrome/browser/ui/views/apps/native_app_window_views.h
index 804e64a6dacfec7bb2d45fb510122cd5f3d55ce9..02326991af61ea4c611b31f684cfacc553c32af5 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.h
+++ b/chrome/browser/ui/views/apps/native_app_window_views.h
@@ -18,10 +18,6 @@
#include "ui/views/widget/widget_delegate.h"
#include "ui/views/widget/widget_observer.h"
-#if defined(OS_WIN)
-#include "chrome/browser/shell_integration.h"
-#endif
-
#if defined(USE_ASH)
namespace ash {
class ImmersiveFullscreenController;
@@ -76,18 +72,20 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
virtual void Show() OVERRIDE;
virtual void Activate() OVERRIDE;
- Profile* profile() { return shell_window_->profile(); }
- const extensions::Extension* extension() {
+ Profile* profile() const { return shell_window_->profile(); }
tapted 2014/02/12 10:16:28 nit: there's usually a guideline that `const` func
+ const extensions::Extension* extension() const {
return shell_window_->extension();
}
+ views::Widget* window() const { return window_; }
+
+ virtual void InitializeDefaultWindow(
+ const apps::ShellWindow::CreateParams& create_params);
+ virtual void InitializePanelWindow(
+ const apps::ShellWindow::CreateParams& create_params);
private:
friend class ShapedAppWindowTargeterTest;
- void InitializeDefaultWindow(
- const apps::ShellWindow::CreateParams& create_params);
- void InitializePanelWindow(
- const apps::ShellWindow::CreateParams& create_params);
void OnViewWasResized();
bool ShouldUseChromeStyleFrame() const;
@@ -95,12 +93,6 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
// Caller owns the returned object.
apps::ShellWindowFrameView* CreateShellWindowFrameView();
-#if defined(OS_WIN)
- void OnShortcutInfoLoaded(
- const ShellIntegration::ShortcutInfo& shortcut_info);
- HWND GetNativeAppWindowHWND() const;
-#endif
-
// ui::BaseWindow implementation.
virtual bool IsActive() const OVERRIDE;
virtual bool IsMaximized() const OVERRIDE;
@@ -191,6 +183,7 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
virtual void HideWithApp() OVERRIDE;
virtual void ShowWithApp() OVERRIDE;
virtual void UpdateWindowMinMaxSize() OVERRIDE;
+ virtual void UpdateAppMenu() OVERRIDE;
// web_modal::WebContentsModalDialogHost implementation.
virtual gfx::NativeView GetHostView() const OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698