| OLD | NEW |
| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/scoped_nsobject.h" | 9 #include "base/memory/scoped_nsobject.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 bool should_restore_state) OVERRIDE; | 74 bool should_restore_state) OVERRIDE; |
| 75 virtual void FocusToolbar() OVERRIDE; | 75 virtual void FocusToolbar() OVERRIDE; |
| 76 virtual void FocusAppMenu() OVERRIDE; | 76 virtual void FocusAppMenu() OVERRIDE; |
| 77 virtual void FocusBookmarksToolbar() OVERRIDE; | 77 virtual void FocusBookmarksToolbar() OVERRIDE; |
| 78 virtual void FocusChromeOSStatus() OVERRIDE; | 78 virtual void FocusChromeOSStatus() OVERRIDE; |
| 79 virtual void RotatePaneFocus(bool forwards) OVERRIDE; | 79 virtual void RotatePaneFocus(bool forwards) OVERRIDE; |
| 80 virtual bool IsBookmarkBarVisible() const OVERRIDE; | 80 virtual bool IsBookmarkBarVisible() const OVERRIDE; |
| 81 virtual bool IsBookmarkBarAnimating() const OVERRIDE; | 81 virtual bool IsBookmarkBarAnimating() const OVERRIDE; |
| 82 virtual bool IsTabStripEditable() const OVERRIDE; | 82 virtual bool IsTabStripEditable() const OVERRIDE; |
| 83 virtual bool IsToolbarVisible() const OVERRIDE; | 83 virtual bool IsToolbarVisible() const OVERRIDE; |
| 84 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; |
| 84 virtual bool IsPanel() const OVERRIDE; | 85 virtual bool IsPanel() const OVERRIDE; |
| 85 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, | 86 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, |
| 86 Profile* profile) OVERRIDE; | 87 Profile* profile) OVERRIDE; |
| 87 virtual void ToggleBookmarkBar() OVERRIDE; | 88 virtual void ToggleBookmarkBar() OVERRIDE; |
| 88 virtual void ShowAboutChromeDialog() OVERRIDE; | 89 virtual void ShowAboutChromeDialog() OVERRIDE; |
| 89 virtual void ShowUpdateChromeDialog() OVERRIDE; | 90 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 90 virtual void ShowTaskManager() OVERRIDE; | 91 virtual void ShowTaskManager() OVERRIDE; |
| 91 virtual void ShowBackgroundPages() OVERRIDE; | 92 virtual void ShowBackgroundPages() OVERRIDE; |
| 92 virtual void ShowBookmarkBubble(const GURL& url, | 93 virtual void ShowBookmarkBubble(const GURL& url, |
| 93 bool already_bookmarked) OVERRIDE; | 94 bool already_bookmarked) OVERRIDE; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 PrefChangeRegistrar pref_change_registrar_; | 153 PrefChangeRegistrar pref_change_registrar_; |
| 153 Browser* browser_; // weak, owned by controller | 154 Browser* browser_; // weak, owned by controller |
| 154 BrowserWindowController* controller_; // weak, owns us | 155 BrowserWindowController* controller_; // weak, owns us |
| 155 base::WeakPtrFactory<Browser> confirm_close_factory_; | 156 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 156 scoped_nsobject<NSString> pending_window_title_; | 157 scoped_nsobject<NSString> pending_window_title_; |
| 157 ui::WindowShowState initial_show_state_; | 158 ui::WindowShowState initial_show_state_; |
| 158 NSInteger attention_request_id_; // identifier from requestUserAttention | 159 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 159 }; | 160 }; |
| 160 | 161 |
| 161 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 162 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |