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

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

Issue 1141005: Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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
« no previous file with comments | « chrome/browser/browser_window.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "chrome/browser/browser_window.h" 8 #include "chrome/browser/browser_window.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/common/notification_registrar.h" 10 #include "chrome/common/notification_registrar.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 bool show_history); 95 bool show_history);
96 virtual void ShowPageMenu(); 96 virtual void ShowPageMenu();
97 virtual void ShowAppMenu(); 97 virtual void ShowAppMenu();
98 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 98 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
99 bool* is_keyboard_shortcut); 99 bool* is_keyboard_shortcut);
100 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); 100 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
101 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents); 101 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
102 virtual void Cut(); 102 virtual void Cut();
103 virtual void Copy(); 103 virtual void Copy();
104 virtual void Paste(); 104 virtual void Paste();
105 virtual void ToggleTabStripMode();
106 105
107 // Overridden from NotificationObserver 106 // Overridden from NotificationObserver
108 virtual void Observe(NotificationType type, 107 virtual void Observe(NotificationType type,
109 const NotificationSource& source, 108 const NotificationSource& source,
110 const NotificationDetails& details); 109 const NotificationDetails& details);
111 110
112 // Adds the given FindBar cocoa controller to this browser window. 111 // Adds the given FindBar cocoa controller to this browser window.
113 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 112 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
114 113
115 // Returns the cocoa-world BrowserWindowController 114 // Returns the cocoa-world BrowserWindowController
116 BrowserWindowController* cocoa_controller() { return controller_; } 115 BrowserWindowController* cocoa_controller() { return controller_; }
117 116
118 protected: 117 protected:
119 virtual void DestroyBrowser(); 118 virtual void DestroyBrowser();
120 119
121 private: 120 private:
122 int GetCommandId(const NativeWebKeyboardEvent& event); 121 int GetCommandId(const NativeWebKeyboardEvent& event);
123 bool HandleKeyboardEventInternal(NSEvent* event); 122 bool HandleKeyboardEventInternal(NSEvent* event);
124 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 123 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
125 124
126 NotificationRegistrar registrar_; 125 NotificationRegistrar registrar_;
127 Browser* browser_; // weak, owned by controller 126 Browser* browser_; // weak, owned by controller
128 BrowserWindowController* controller_; // weak, owns us 127 BrowserWindowController* controller_; // weak, owns us
129 }; 128 };
130 129
131 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 130 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_window.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698