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

Side by Side Diff: apps/ui/views/native_app_window_views.h

Issue 213743017: Remove title and icon from chrome apps native style title bars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed leak in test Created 6 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 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 APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ 5 #ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
6 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ 6 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
7 7
8 #include "apps/size_constraints.h" 8 #include "apps/size_constraints.h"
9 #include "apps/ui/native_app_window.h" 9 #include "apps/ui/native_app_window.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class NativeAppWindowViews : public NativeAppWindow, 45 class NativeAppWindowViews : public NativeAppWindow,
46 public content::WebContentsObserver, 46 public content::WebContentsObserver,
47 public views::WidgetDelegateView, 47 public views::WidgetDelegateView,
48 public views::WidgetObserver { 48 public views::WidgetObserver {
49 public: 49 public:
50 NativeAppWindowViews(); 50 NativeAppWindowViews();
51 virtual ~NativeAppWindowViews(); 51 virtual ~NativeAppWindowViews();
52 void Init(AppWindow* app_window, 52 void Init(AppWindow* app_window,
53 const AppWindow::CreateParams& create_params); 53 const AppWindow::CreateParams& create_params);
54 54
55 views::Widget* widget() { return widget_; }
56
55 void set_window_for_testing(views::Widget* window) { widget_ = window; } 57 void set_window_for_testing(views::Widget* window) { widget_ = window; }
56 void set_web_view_for_testing(views::WebView* view) { web_view_ = view; } 58 void set_web_view_for_testing(views::WebView* view) { web_view_ = view; }
57 59
58 protected: 60 protected:
59 AppWindow* app_window() { return app_window_; } 61 AppWindow* app_window() { return app_window_; }
60 const AppWindow* app_window() const { return app_window_; } 62 const AppWindow* app_window() const { return app_window_; }
61 63
62 views::Widget* widget() { return widget_; }
63 const views::Widget* widget() const { return widget_; } 64 const views::Widget* widget() const { return widget_; }
64 65
65 views::WebView* web_view() { return web_view_; } 66 views::WebView* web_view() { return web_view_; }
66 67
67 // Initializes |widget_| for |app_window|. 68 // Initializes |widget_| for |app_window|.
68 virtual void InitializeWindow(AppWindow* app_window, 69 virtual void InitializeWindow(AppWindow* app_window,
69 const AppWindow::CreateParams& create_params); 70 const AppWindow::CreateParams& create_params);
70 71
71 // ui::BaseWindow implementation. 72 // ui::BaseWindow implementation.
72 virtual bool IsActive() const OVERRIDE; 73 virtual bool IsActive() const OVERRIDE;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 183 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
183 184
184 ObserverList<web_modal::ModalDialogHostObserver> observer_list_; 185 ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
185 186
186 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); 187 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
187 }; 188 };
188 189
189 } // namespace apps 190 } // namespace apps
190 191
191 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ 192 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
OLDNEW
« no previous file with comments | « apps/ui/views/app_window_frame_view.cc ('k') | chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698