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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.h

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
7 7
8 #include "apps/ui/views/native_app_window_views.h" 8 #include "apps/ui/views/native_app_window_views.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/context_menu_controller.h" 10 #include "ui/views/context_menu_controller.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 // WidgetDelegate implementation. 60 // WidgetDelegate implementation.
61 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; 61 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
62 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 62 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
63 virtual views::NonClientFrameView* CreateNonClientFrameView( 63 virtual views::NonClientFrameView* CreateNonClientFrameView(
64 views::Widget* widget) OVERRIDE; 64 views::Widget* widget) OVERRIDE;
65 virtual bool WidgetHasHitTestMask() const OVERRIDE; 65 virtual bool WidgetHasHitTestMask() const OVERRIDE;
66 virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; 66 virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
67 67
68 // views::View implementation. 68 // views::View implementation.
69 virtual gfx::Size GetPreferredSize() OVERRIDE; 69 virtual gfx::Size GetPreferredSize() const OVERRIDE;
70 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 70 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
71 71
72 // NativeAppWindow implementation. 72 // NativeAppWindow implementation.
73 virtual void SetFullscreen(int fullscreen_types) OVERRIDE; 73 virtual void SetFullscreen(int fullscreen_types) OVERRIDE;
74 virtual bool IsFullscreenOrPending() const OVERRIDE; 74 virtual bool IsFullscreenOrPending() const OVERRIDE;
75 virtual bool IsDetached() const OVERRIDE; 75 virtual bool IsDetached() const OVERRIDE;
76 virtual void UpdateBadgeIcon() OVERRIDE; 76 virtual void UpdateBadgeIcon() OVERRIDE;
77 virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE; 77 virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
78 virtual bool HasFrameColor() const OVERRIDE; 78 virtual bool HasFrameColor() const OVERRIDE;
79 virtual SkColor ActiveFrameColor() const OVERRIDE; 79 virtual SkColor ActiveFrameColor() const OVERRIDE;
(...skipping 28 matching lines...) Expand all
108 immersive_fullscreen_controller_; 108 immersive_fullscreen_controller_;
109 #endif // defined(USE_ASH) 109 #endif // defined(USE_ASH)
110 110
111 // Used to show the system menu. 111 // Used to show the system menu.
112 scoped_ptr<views::MenuRunner> menu_runner_; 112 scoped_ptr<views::MenuRunner> menu_runner_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); 114 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews);
115 }; 115 };
116 116
117 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ 117 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698