chrome/browser/ui/views/apps/native_app_window_views.h - Issue 27207003: Fix declaration vs. implementation ordering in NativeAppWindow{Views|Gtk}

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 27207003: Fix declaration vs. implementation ordering in NativeAppWindow{Views|Gtk} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: move native_app_window.h to ui Created 7 years, 2 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

« no previous file with comments | « chrome/browser/ui/gtk/apps/native_app_window_gtk.cc ('k') | chrome/browser/ui/views/apps/native_app_window_views.cc » ('j') | chrome/browser/ui/views/apps/native_app_window_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e238bd865f65ac7692490a570cccff1aba3a5946..caecca39cca94c1999973a8917da83d3d7f01a58 100644

--- a/chrome/browser/ui/views/apps/native_app_window_views.h

+++ b/chrome/browser/ui/views/apps/native_app_window_views.h

@@ -5,8 +5,8 @@

#ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_

#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_

-#include "apps/native_app_window.h"

#include "apps/shell_window.h"

+#include "apps/ui/native_app_window.h"

#include "base/observer_list.h"

#include "content/public/browser/web_contents_observer.h"

#include "third_party/skia/include/core/SkRegion.h"

@@ -88,6 +88,7 @@ class NativeAppWindowViews : public apps::NativeAppWindow,

virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;

virtual void FlashFrame(bool flash) OVERRIDE;

virtual bool IsAlwaysOnTop() const OVERRIDE;

+ virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;

// WidgetDelegate implementation.

virtual void OnWidgetMove() OVERRIDE;

@@ -142,10 +143,10 @@ class NativeAppWindowViews : public apps::NativeAppWindow,

virtual bool IsDetached() const OVERRIDE;

virtual void UpdateWindowIcon() OVERRIDE;

virtual void UpdateWindowTitle() OVERRIDE;

- virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) OVERRIDE;

virtual void UpdateDraggableRegions(

const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;

virtual SkRegion* GetDraggableRegion() OVERRIDE;

+ virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) OVERRIDE;

virtual void HandleKeyboardEvent(

const content::NativeWebKeyboardEvent& event) OVERRIDE;

virtual bool IsFrameless() const OVERRIDE;

@@ -153,7 +154,6 @@ class NativeAppWindowViews : public apps::NativeAppWindow,

virtual bool IsVisible() const OVERRIDE;

virtual void HideWithApp() OVERRIDE;

virtual void ShowWithApp() OVERRIDE;

- virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;

// web_modal::WebContentsModalDialogHost implementation.

virtual gfx::NativeView GetHostView() const OVERRIDE;