chrome/browser/ui/cocoa/browser_window_cocoa.h - Issue 6913026: Compact Navigation prototype

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

Issue 6913026: Compact Navigation prototype (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Clang build fix. After commit/revert. Created 9 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #pragma once	7 #pragma once

8	8

9 #include "base/memory/scoped_nsobject.h"	9 #include "base/memory/scoped_nsobject.h"

10 #include "base/task.h"	10 #include "base/task.h"

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 bool* is_keyboard_shortcut);	97 bool* is_keyboard_shortcut);

98 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);	98 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);

99 virtual void ShowCreateWebAppShortcutsDialog(	99 virtual void ShowCreateWebAppShortcutsDialog(

100 TabContentsWrapper* tab_contents);	100 TabContentsWrapper* tab_contents);

101 virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile,	101 virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile,

102 const Extension* app);	102 const Extension* app);

103 virtual void Cut();	103 virtual void Cut();

104 virtual void Copy();	104 virtual void Copy();

105 virtual void Paste();	105 virtual void Paste();

106 virtual void ToggleTabStripMode();	106 virtual void ToggleTabStripMode();

	107 virtual void ToggleUseCompactNavigationBar() {}

107 virtual void OpenTabpose();	108 virtual void OpenTabpose();

108 virtual void PrepareForInstant();	109 virtual void PrepareForInstant();

109 virtual void ShowInstant(TabContentsWrapper* preview);	110 virtual void ShowInstant(TabContentsWrapper* preview);

110 virtual void HideInstant(bool instant_is_active);	111 virtual void HideInstant(bool instant_is_active);

111 virtual gfx::Rect GetInstantBounds();	112 virtual gfx::Rect GetInstantBounds();

112 virtual WindowOpenDisposition GetDispositionForPopupBounds(	113 virtual WindowOpenDisposition GetDispositionForPopupBounds(

113 const gfx::Rect& bounds);	114 const gfx::Rect& bounds);

114	115

115 // Overridden from NotificationObserver	116 // Overridden from NotificationObserver

116 virtual void Observe(NotificationType type,	117 virtual void Observe(NotificationType type,

(...skipping 16 matching lines...) Expand all Loading...
133 void UpdateSidebarForContents(TabContents* tab_contents);	134 void UpdateSidebarForContents(TabContents* tab_contents);

134	135

135 NotificationRegistrar registrar_;	136 NotificationRegistrar registrar_;

136 Browser* browser_; // weak, owned by controller	137 Browser* browser_; // weak, owned by controller

137 BrowserWindowController* controller_; // weak, owns us	138 BrowserWindowController* controller_; // weak, owns us

138 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;	139 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;

139 scoped_nsobject<NSString> pending_window_title_;	140 scoped_nsobject<NSString> pending_window_title_;

140 };	141 };

141	142

142 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	143 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

OLD	NEW