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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 1158523002: Add user_gesture param to BaseWindow::Show Base URL: https://chromium.googlesource.com/chromium/src.git@ug3_BaseWindow_Activate
Patch Set: Update callers Created 5 years, 7 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 (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_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 25 matching lines...) Expand all
36 : public BrowserWindow, 36 : public BrowserWindow,
37 public ExclusiveAccessContext, 37 public ExclusiveAccessContext,
38 public extensions::ExtensionKeybindingRegistry::Delegate, 38 public extensions::ExtensionKeybindingRegistry::Delegate,
39 public SearchModelObserver { 39 public SearchModelObserver {
40 public: 40 public:
41 BrowserWindowCocoa(Browser* browser, 41 BrowserWindowCocoa(Browser* browser,
42 BrowserWindowController* controller); 42 BrowserWindowController* controller);
43 ~BrowserWindowCocoa() override; 43 ~BrowserWindowCocoa() override;
44 44
45 // Overridden from BrowserWindow 45 // Overridden from BrowserWindow
46 void Show() override; 46 void Show(bool user_gesture) override;
47 void ShowInactive() override; 47 void ShowInactive() override;
48 void Hide() override; 48 void Hide() override;
49 void SetBounds(const gfx::Rect& bounds) override; 49 void SetBounds(const gfx::Rect& bounds) override;
50 void Close() override; 50 void Close() override;
51 void Activate(bool user_gesture) override; 51 void Activate(bool user_gesture) override;
52 void Deactivate() override; 52 void Deactivate() override;
53 bool IsActive() const override; 53 bool IsActive() const override;
54 void FlashFrame(bool flash) override; 54 void FlashFrame(bool flash) override;
55 bool IsAlwaysOnTop() const override; 55 bool IsAlwaysOnTop() const override;
56 void SetAlwaysOnTop(bool always_on_top) override; 56 void SetAlwaysOnTop(bool always_on_top) override;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 185 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
186 186
187 Browser* browser_; // weak, owned by controller 187 Browser* browser_; // weak, owned by controller
188 BrowserWindowController* controller_; // weak, owns us 188 BrowserWindowController* controller_; // weak, owns us
189 base::scoped_nsobject<NSString> pending_window_title_; 189 base::scoped_nsobject<NSString> pending_window_title_;
190 ui::WindowShowState initial_show_state_; 190 ui::WindowShowState initial_show_state_;
191 NSInteger attention_request_id_; // identifier from requestUserAttention 191 NSInteger attention_request_id_; // identifier from requestUserAttention
192 }; 192 };
193 193
194 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 194 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698