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

Side by Side Diff: chrome/browser/ui/panels/panel_window_controller_cocoa.h

Issue 10106008: Change Panel titlebars to activate the panel on click (rather than minimize). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mac changes. New test. Ready for review. Created 8 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 | Annotate | Revision Log
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_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_
7 7
8 // A class acting as the Objective-C controller for the Panel window 8 // A class acting as the Objective-C controller for the Panel window
9 // object. Handles interactions between Cocoa and the cross-platform 9 // object. Handles interactions between Cocoa and the cross-platform
10 // code. Each window has a single titlebar and is managed/owned by Panel. 10 // code. Each window has a single titlebar and is managed/owned by Panel.
11 11
12 #import <Cocoa/Cocoa.h> 12 #import <Cocoa/Cocoa.h>
13 13
14 #import "base/mac/cocoa_protocols.h" 14 #import "base/mac/cocoa_protocols.h"
15 #include "base/memory/scoped_nsobject.h" 15 #include "base/memory/scoped_nsobject.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/time.h" 17 #include "base/time.h"
18 #import "chrome/browser/ui/cocoa/browser_command_executor.h" 18 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
19 #import "chrome/browser/ui/cocoa/chrome_browser_window.h" 19 #import "chrome/browser/ui/cocoa/chrome_browser_window.h"
20 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 20 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
21 #import "chrome/browser/ui/cocoa/themed_window.h" 21 #import "chrome/browser/ui/cocoa/themed_window.h"
22 #import "chrome/browser/ui/cocoa/tracking_area.h" 22 #import "chrome/browser/ui/cocoa/tracking_area.h"
23 #include "chrome/browser/ui/panels/panel.h" 23 #include "chrome/browser/ui/panels/panel.h"
24 24
25 @class FindBarCocoaController; 25 @class FindBarCocoaController;
26 class PanelBrowserWindowCocoa; 26 class PanelBrowserWindowCocoa;
27 @class PanelTitlebarViewCocoa; 27 @class PanelTitlebarViewCocoa;
28 28
29 @interface PanelWindowCocoaImpl : ChromeBrowserWindow { 29 @interface PanelWindowCocoaImpl : ChromeBrowserWindow {
30 // Panel windows use a higher priority NSWindowLevel to ensure they are always
31 // visible, causing the OS to prefer panel windows when selecting a window
32 // to make the key window. To counter this preference, we override
33 // -[NSWindow:canBecomeKeyWindow] to restrict when the panel can become the
34 // key window to a limited set of scenarios, such as when cycling through
35 // windows, when panels are the only remaining windows, when an event
36 // triggers window activation, etc. The panel may also be prevented from
37 // becoming the key window, regardless of the above scenarios, such as when
38 // a panel is minimized.
39 BOOL canBecomeKey_; // Defaults to NO.
40 } 30 }
41 @end 31 @end
42 32
43 @interface PanelWindowControllerCocoa : NSWindowController 33 @interface PanelWindowControllerCocoa : NSWindowController
44 <NSWindowDelegate, 34 <NSWindowDelegate,
45 NSAnimationDelegate, 35 NSAnimationDelegate,
46 BrowserCommandExecutor> { 36 BrowserCommandExecutor> {
47 @private 37 @private
48 IBOutlet PanelTitlebarViewCocoa* titlebar_view_; 38 IBOutlet PanelTitlebarViewCocoa* titlebar_view_;
49 scoped_ptr<PanelBrowserWindowCocoa> windowShim_; 39 scoped_ptr<PanelBrowserWindowCocoa> windowShim_;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // Returns width of titlebar when shown in "icon only" mode. 136 // Returns width of titlebar when shown in "icon only" mode.
147 - (int)titlebarIconOnlyWidthInScreenCoordinates; 137 - (int)titlebarIconOnlyWidthInScreenCoordinates;
148 138
149 - (void)ensureFullyVisible; 139 - (void)ensureFullyVisible;
150 140
151 - (void)updateWindowLevel; 141 - (void)updateWindowLevel;
152 142
153 // Turns on user-resizable corners/sides indications and enables live resize. 143 // Turns on user-resizable corners/sides indications and enables live resize.
154 - (void)enableResizeByMouse:(BOOL)enable; 144 - (void)enableResizeByMouse:(BOOL)enable;
155 145
156 // In certain cases (when in a Docked strip for example) we want
157 // the standard behavior of activating the app when clicking on the titlebar
158 // to be disabled. This way, user can minimize the panel w/o activating it.
159 - (BOOL)isActivationByClickingTitlebarEnabled;
160 @end // @interface PanelWindowController 146 @end // @interface PanelWindowController
161 147
162 #endif // CHROME_BROWSER_UI_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_ 148 #endif // CHROME_BROWSER_UI_PANELS_PANEL_WINDOW_CONTROLLER_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698