diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 06:04:07 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 06:04:07 +0000 |
| commit | 8e9dc842eddfcb87824e23d52b8e35b480e5f673 (patch) | |
| tree | d4b843b87f011a59f676240ee581982791906686 /apps | |
| parent | 11a5eceb9bc0ac7b7615244db0c25939f5c63f51 (diff) | |
| download | chromium_src-8e9dc842eddfcb87824e23d52b8e35b480e5f673.zip chromium_src-8e9dc842eddfcb87824e23d52b8e35b480e5f673.tar.gz chromium_src-8e9dc842eddfcb87824e23d52b8e35b480e5f673.tar.bz2 | |
Rename setInputRegion API to setShape, and update impl accordingly.
BUG=314222
Review URL: https://codereview.chromium.org/84323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell_window.cc | 4 | ||||
| -rw-r--r-- | apps/shell_window.h | 5 | ||||
| -rw-r--r-- | apps/ui/native_app_window.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/apps/shell_window.cc b/apps/shell_window.cc index aade475..c50e532 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -387,8 +387,8 @@ void ShellWindow::SetAppIconUrl(const GURL& url) { image_loader_ptr_factory_.GetWeakPtr())); } -void ShellWindow::UpdateInputRegion(scoped_ptr<SkRegion> region) { - native_app_window_->UpdateInputRegion(region.Pass()); +void ShellWindow::UpdateShape(scoped_ptr<SkRegion> region) { + native_app_window_->UpdateShape(region.Pass()); } void ShellWindow::UpdateDraggableRegions( diff --git a/apps/shell_window.h b/apps/shell_window.h index d8d3964..86dafb5 100644 --- a/apps/shell_window.h +++ b/apps/shell_window.h @@ -280,9 +280,8 @@ class ShellWindow : public content::NotificationObserver, // Specifies a url for the launcher icon. void SetAppIconUrl(const GURL& icon_url); - // Set the region in the window that will accept input events. - // If |region| is NULL, then the entire window will accept input events. - void UpdateInputRegion(scoped_ptr<SkRegion> region); + // Set the window shape. Passing a NULL |region| sets the default shape. + void UpdateShape(scoped_ptr<SkRegion> region); // Called from the render interface to modify the draggable regions. void UpdateDraggableRegions( diff --git a/apps/ui/native_app_window.h b/apps/ui/native_app_window.h index 73f6f88..dece2d91 100644 --- a/apps/ui/native_app_window.h +++ b/apps/ui/native_app_window.h @@ -41,9 +41,9 @@ class NativeAppWindow : public ui::BaseWindow, // Returns the region used by frameless windows for dragging. May return NULL. virtual SkRegion* GetDraggableRegion() = 0; - // Called when the region that accepts input events is changed. - // If |region| is NULL, then the entire window will accept input events. - virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) = 0; + // Called when the window shape is changed. If |region| is NULL then the + // window is restored to the default shape. + virtual void UpdateShape(scoped_ptr<SkRegion> region) = 0; // Allows the window to handle unhandled keyboard messages coming back from // the renderer. |