| 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 | 7 |
| 8 #include "base/memory/scoped_nsobject.h" | 8 #include "base/memory/scoped_nsobject.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 Profile* profile) OVERRIDE; | 93 Profile* profile) OVERRIDE; |
| 94 virtual void ToggleBookmarkBar() OVERRIDE; | 94 virtual void ToggleBookmarkBar() OVERRIDE; |
| 95 virtual void ShowUpdateChromeDialog() OVERRIDE; | 95 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 96 virtual void ShowTaskManager() OVERRIDE; | 96 virtual void ShowTaskManager() OVERRIDE; |
| 97 virtual void ShowBackgroundPages() OVERRIDE; | 97 virtual void ShowBackgroundPages() OVERRIDE; |
| 98 virtual void ShowBookmarkBubble(const GURL& url, | 98 virtual void ShowBookmarkBubble(const GURL& url, |
| 99 bool already_bookmarked) OVERRIDE; | 99 bool already_bookmarked) OVERRIDE; |
| 100 virtual void ShowChromeToMobileBubble() OVERRIDE; | 100 virtual void ShowChromeToMobileBubble() OVERRIDE; |
| 101 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 101 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 102 virtual void ShowOneClickSigninBubble( | 102 virtual void ShowOneClickSigninBubble( |
| 103 OneClickSigninBubbleType type, |
| 103 const StartSyncCallback& start_sync_callback) OVERRIDE; | 104 const StartSyncCallback& start_sync_callback) OVERRIDE; |
| 104 #endif | 105 #endif |
| 105 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 106 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
| 106 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 107 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; |
| 107 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; | 108 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; |
| 108 virtual void UserChangedTheme() OVERRIDE; | 109 virtual void UserChangedTheme() OVERRIDE; |
| 109 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 110 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
| 110 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 111 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
| 111 virtual void ShowWebsiteSettings(Profile* profile, | 112 virtual void ShowWebsiteSettings(Profile* profile, |
| 112 content::WebContents* web_contents, | 113 content::WebContents* web_contents, |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 167 |
| 167 Browser* browser_; // weak, owned by controller | 168 Browser* browser_; // weak, owned by controller |
| 168 BrowserWindowController* controller_; // weak, owns us | 169 BrowserWindowController* controller_; // weak, owns us |
| 169 base::WeakPtrFactory<Browser> confirm_close_factory_; | 170 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 170 scoped_nsobject<NSString> pending_window_title_; | 171 scoped_nsobject<NSString> pending_window_title_; |
| 171 ui::WindowShowState initial_show_state_; | 172 ui::WindowShowState initial_show_state_; |
| 172 NSInteger attention_request_id_; // identifier from requestUserAttention | 173 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 173 }; | 174 }; |
| 174 | 175 |
| 175 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 176 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |