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

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

Issue 10332185: Update behavior of one-click infobar to remove modal dialog, add "undo". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't call ok in tests of advanced link Created 8 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
OLDNEW
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 virtual void ToggleBookmarkBar() OVERRIDE; 88 virtual void ToggleBookmarkBar() OVERRIDE;
89 virtual void ShowAboutChromeDialog() OVERRIDE; 89 virtual void ShowAboutChromeDialog() OVERRIDE;
90 virtual void ShowUpdateChromeDialog() OVERRIDE; 90 virtual void ShowUpdateChromeDialog() OVERRIDE;
91 virtual void ShowTaskManager() OVERRIDE; 91 virtual void ShowTaskManager() OVERRIDE;
92 virtual void ShowBackgroundPages() OVERRIDE; 92 virtual void ShowBackgroundPages() OVERRIDE;
93 virtual void ShowBookmarkBubble(const GURL& url, 93 virtual void ShowBookmarkBubble(const GURL& url,
94 bool already_bookmarked) OVERRIDE; 94 bool already_bookmarked) OVERRIDE;
95 virtual void ShowChromeToMobileBubble() OVERRIDE; 95 virtual void ShowChromeToMobileBubble() OVERRIDE;
96 #if defined(ENABLE_ONE_CLICK_SIGNIN) 96 #if defined(ENABLE_ONE_CLICK_SIGNIN)
97 virtual void ShowOneClickSigninBubble( 97 virtual void ShowOneClickSigninBubble(
98 const base::Closure& learn_more_callback, 98 const base::Callback<void(bool)>& start_sync_callback) OVERRIDE;
99 const base::Closure& advanced_callback) OVERRIDE;
100 #endif 99 #endif
101 virtual bool IsDownloadShelfVisible() const OVERRIDE; 100 virtual bool IsDownloadShelfVisible() const OVERRIDE;
102 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; 101 virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
103 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; 102 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
104 virtual void UserChangedTheme() OVERRIDE; 103 virtual void UserChangedTheme() OVERRIDE;
105 virtual int GetExtraRenderViewHeight() const OVERRIDE; 104 virtual int GetExtraRenderViewHeight() const OVERRIDE;
106 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; 105 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
107 virtual void ShowPageInfo(Profile* profile, 106 virtual void ShowPageInfo(Profile* profile,
108 const GURL& url, 107 const GURL& url,
109 const content::SSLStatus& ssl, 108 const content::SSLStatus& ssl,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 PrefChangeRegistrar pref_change_registrar_; 162 PrefChangeRegistrar pref_change_registrar_;
164 Browser* browser_; // weak, owned by controller 163 Browser* browser_; // weak, owned by controller
165 BrowserWindowController* controller_; // weak, owns us 164 BrowserWindowController* controller_; // weak, owns us
166 base::WeakPtrFactory<Browser> confirm_close_factory_; 165 base::WeakPtrFactory<Browser> confirm_close_factory_;
167 scoped_nsobject<NSString> pending_window_title_; 166 scoped_nsobject<NSString> pending_window_title_;
168 ui::WindowShowState initial_show_state_; 167 ui::WindowShowState initial_show_state_;
169 NSInteger attention_request_id_; // identifier from requestUserAttention 168 NSInteger attention_request_id_; // identifier from requestUserAttention
170 }; 169 };
171 170
172 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 171 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698