Chromium Code Reviews| 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 <string> | |
|
Roger Tawa OOO till Jul 10th
2013/04/26 18:28:21
Probably not needed either.
| |
| 9 | |
| 8 #include "base/memory/scoped_nsobject.h" | 10 #include "base/memory/scoped_nsobject.h" |
| 9 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 12 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 11 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 13 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| 12 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" |
| 13 #include "chrome/browser/ui/search/search_model_observer.h" | 15 #include "chrome/browser/ui/search/search_model_observer.h" |
| 14 #include "ui/base/ui_base_types.h" | 16 #include "ui/base/ui_base_types.h" |
| 15 | 17 |
| 16 class Browser; | 18 class Browser; |
| 17 @class BrowserWindowController; | 19 @class BrowserWindowController; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 Profile* profile) OVERRIDE; | 96 Profile* profile) OVERRIDE; |
| 95 virtual void ToggleBookmarkBar() OVERRIDE; | 97 virtual void ToggleBookmarkBar() OVERRIDE; |
| 96 virtual void ShowUpdateChromeDialog() OVERRIDE; | 98 virtual void ShowUpdateChromeDialog() OVERRIDE; |
| 97 virtual void ShowBookmarkBubble(const GURL& url, | 99 virtual void ShowBookmarkBubble(const GURL& url, |
| 98 bool already_bookmarked) OVERRIDE; | 100 bool already_bookmarked) OVERRIDE; |
| 99 virtual void ShowChromeToMobileBubble() OVERRIDE; | 101 virtual void ShowChromeToMobileBubble() OVERRIDE; |
| 100 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 102 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 101 virtual void ShowOneClickSigninBubble( | 103 virtual void ShowOneClickSigninBubble( |
| 102 OneClickSigninBubbleType type, | 104 OneClickSigninBubbleType type, |
| 103 const string16& email, | 105 const string16& email, |
| 106 const string16& error_message, | |
| 104 const StartSyncCallback& start_sync_callback) OVERRIDE; | 107 const StartSyncCallback& start_sync_callback) OVERRIDE; |
| 105 #endif | 108 #endif |
| 106 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 109 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
| 107 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 110 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; |
| 108 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; | 111 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; |
| 109 virtual void UserChangedTheme() OVERRIDE; | 112 virtual void UserChangedTheme() OVERRIDE; |
| 110 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 113 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
| 111 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 114 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
| 112 virtual void ShowWebsiteSettings(Profile* profile, | 115 virtual void ShowWebsiteSettings(Profile* profile, |
| 113 content::WebContents* web_contents, | 116 content::WebContents* web_contents, |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 | 168 |
| 166 Browser* browser_; // weak, owned by controller | 169 Browser* browser_; // weak, owned by controller |
| 167 BrowserWindowController* controller_; // weak, owns us | 170 BrowserWindowController* controller_; // weak, owns us |
| 168 base::WeakPtrFactory<Browser> confirm_close_factory_; | 171 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 169 scoped_nsobject<NSString> pending_window_title_; | 172 scoped_nsobject<NSString> pending_window_title_; |
| 170 ui::WindowShowState initial_show_state_; | 173 ui::WindowShowState initial_show_state_; |
| 171 NSInteger attention_request_id_; // identifier from requestUserAttention | 174 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 172 }; | 175 }; |
| 173 | 176 |
| 174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 177 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |