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

Side by Side Diff: chrome/browser/ui/views/chrome_views_delegate.h

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHROME_VIEWS_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 10 matching lines...) Expand all
21 const std::string& window_name, 21 const std::string& window_name,
22 const gfx::Rect& bounds, 22 const gfx::Rect& bounds,
23 ui::WindowShowState show_state) override; 23 ui::WindowShowState show_state) override;
24 bool GetSavedWindowPlacement(const views::Widget* widget, 24 bool GetSavedWindowPlacement(const views::Widget* widget,
25 const std::string& window_name, 25 const std::string& window_name,
26 gfx::Rect* bounds, 26 gfx::Rect* bounds,
27 ui::WindowShowState* show_state) const override; 27 ui::WindowShowState* show_state) const override;
28 void NotifyAccessibilityEvent(views::View* view, 28 void NotifyAccessibilityEvent(views::View* view,
29 ui::AXEvent event_type) override; 29 ui::AXEvent event_type) override;
30 #if defined(OS_WIN) 30 #if defined(OS_WIN)
31 virtual HICON GetDefaultWindowIcon() const override; 31 HICON GetDefaultWindowIcon() const override;
32 virtual HICON GetSmallWindowIcon() const override; 32 HICON GetSmallWindowIcon() const override;
33 virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; 33 bool IsWindowInMetro(gfx::NativeWindow window) const override;
34 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) 34 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
35 gfx::ImageSkia* GetDefaultWindowIcon() const override; 35 gfx::ImageSkia* GetDefaultWindowIcon() const override;
36 #endif 36 #endif
37 37
38 #if defined(USE_ASH) 38 #if defined(USE_ASH)
39 views::NonClientFrameView* CreateDefaultNonClientFrameView( 39 views::NonClientFrameView* CreateDefaultNonClientFrameView(
40 views::Widget* widget) override; 40 views::Widget* widget) override;
41 #endif 41 #endif
42 void AddRef() override; 42 void AddRef() override;
43 void ReleaseRef() override; 43 void ReleaseRef() override;
44 void OnBeforeWidgetInit( 44 void OnBeforeWidgetInit(
45 views::Widget::InitParams* params, 45 views::Widget::InitParams* params,
46 views::internal::NativeWidgetDelegate* delegate) override; 46 views::internal::NativeWidgetDelegate* delegate) override;
47 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 47 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
48 bool WindowManagerProvidesTitleBar(bool maximized) override; 48 bool WindowManagerProvidesTitleBar(bool maximized) override;
49 #endif 49 #endif
50 ui::ContextFactory* GetContextFactory() override; 50 ui::ContextFactory* GetContextFactory() override;
51 std::string GetApplicationName() override; 51 std::string GetApplicationName() override;
52 #if defined(OS_WIN) 52 #if defined(OS_WIN)
53 virtual int GetAppbarAutohideEdges(HMONITOR monitor, 53 int GetAppbarAutohideEdges(HMONITOR monitor,
54 const base::Closure& callback) override; 54 const base::Closure& callback) override;
55 #endif 55 #endif
56 56
57 private: 57 private:
58 #if defined(OS_WIN) 58 #if defined(OS_WIN)
59 typedef std::map<HMONITOR, int> AppbarAutohideEdgeMap; 59 typedef std::map<HMONITOR, int> AppbarAutohideEdgeMap;
60 60
61 // Callback on main thread with the edges. |returned_edges| is the value that 61 // Callback on main thread with the edges. |returned_edges| is the value that
62 // was returned from the call to GetAutohideEdges() that initiated the lookup. 62 // was returned from the call to GetAutohideEdges() that initiated the lookup.
63 void OnGotAppbarAutohideEdges(const base::Closure& callback, 63 void OnGotAppbarAutohideEdges(const base::Closure& callback,
64 HMONITOR monitor, 64 HMONITOR monitor,
(...skipping 12 matching lines...) Expand all
77 // GetAutohideEdges().start a new query. 77 // GetAutohideEdges().start a new query.
78 bool in_autohide_edges_callback_; 78 bool in_autohide_edges_callback_;
79 79
80 base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_; 80 base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_;
81 #endif 81 #endif
82 82
83 DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate); 83 DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
84 }; 84 };
85 85
86 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ 86 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698