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

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

Issue 550413002: Revert "Add AppWindow.setVisibleOnAllWorkspaces." (https://codereview.chromium.org/469993003) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | apps/ui/views/native_app_window_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "content/public/browser/web_contents_observer.h" 9 #include "content/public/browser/web_contents_observer.h"
10 #include "extensions/browser/app_window/app_window.h" 10 #include "extensions/browser/app_window/app_window.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 virtual SkColor InactiveFrameColor() const OVERRIDE; 154 virtual SkColor InactiveFrameColor() const OVERRIDE;
155 virtual gfx::Insets GetFrameInsets() const OVERRIDE; 155 virtual gfx::Insets GetFrameInsets() const OVERRIDE;
156 virtual void HideWithApp() OVERRIDE; 156 virtual void HideWithApp() OVERRIDE;
157 virtual void ShowWithApp() OVERRIDE; 157 virtual void ShowWithApp() OVERRIDE;
158 virtual void UpdateShelfMenu() OVERRIDE; 158 virtual void UpdateShelfMenu() OVERRIDE;
159 virtual gfx::Size GetContentMinimumSize() const OVERRIDE; 159 virtual gfx::Size GetContentMinimumSize() const OVERRIDE;
160 virtual gfx::Size GetContentMaximumSize() const OVERRIDE; 160 virtual gfx::Size GetContentMaximumSize() const OVERRIDE;
161 virtual void SetContentSizeConstraints(const gfx::Size& min_size, 161 virtual void SetContentSizeConstraints(const gfx::Size& min_size,
162 const gfx::Size& max_size) OVERRIDE; 162 const gfx::Size& max_size) OVERRIDE;
163 virtual bool CanHaveAlphaEnabled() const OVERRIDE; 163 virtual bool CanHaveAlphaEnabled() const OVERRIDE;
164 virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE;
165 164
166 // web_modal::WebContentsModalDialogHost implementation. 165 // web_modal::WebContentsModalDialogHost implementation.
167 virtual gfx::NativeView GetHostView() const OVERRIDE; 166 virtual gfx::NativeView GetHostView() const OVERRIDE;
168 virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE; 167 virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
169 virtual gfx::Size GetMaximumDialogSize() OVERRIDE; 168 virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
170 virtual void AddObserver( 169 virtual void AddObserver(
171 web_modal::ModalDialogHostObserver* observer) OVERRIDE; 170 web_modal::ModalDialogHostObserver* observer) OVERRIDE;
172 virtual void RemoveObserver( 171 virtual void RemoveObserver(
173 web_modal::ModalDialogHostObserver* observer) OVERRIDE; 172 web_modal::ModalDialogHostObserver* observer) OVERRIDE;
174 173
(...skipping 14 matching lines...) Expand all
189 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 188 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
190 189
191 ObserverList<web_modal::ModalDialogHostObserver> observer_list_; 190 ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
192 191
193 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); 192 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
194 }; 193 };
195 194
196 } // namespace apps 195 } // namespace apps
197 196
198 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ 197 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | apps/ui/views/native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698