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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 841163002: MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keybinding
Patch Set: Created 5 years, 11 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
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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 void ConfirmAddSearchProvider(TemplateURL* template_url, 307 void ConfirmAddSearchProvider(TemplateURL* template_url,
308 Profile* profile) override; 308 Profile* profile) override;
309 void ShowUpdateChromeDialog() override; 309 void ShowUpdateChromeDialog() override;
310 void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) override; 310 void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) override;
311 void ShowBookmarkAppBubble(const WebApplicationInfo& web_app_info, 311 void ShowBookmarkAppBubble(const WebApplicationInfo& web_app_info,
312 const std::string& extension_id) override; 312 const std::string& extension_id) override;
313 void ShowTranslateBubble(content::WebContents* contents, 313 void ShowTranslateBubble(content::WebContents* contents,
314 translate::TranslateStep step, 314 translate::TranslateStep step,
315 translate::TranslateErrors::Type error_type, 315 translate::TranslateErrors::Type error_type,
316 bool is_user_gesture) override; 316 bool is_user_gesture) override;
317 bool ShowSessionCrashedBubble() override;
318 bool IsProfileResetBubbleSupported() const override;
319 GlobalErrorBubbleViewBase* ShowProfileResetBubble(
320 const base::WeakPtr<ProfileResetGlobalError>& global_error) override;
317 #if defined(ENABLE_ONE_CLICK_SIGNIN) 321 #if defined(ENABLE_ONE_CLICK_SIGNIN)
318 void ShowOneClickSigninBubble( 322 void ShowOneClickSigninBubble(
319 OneClickSigninBubbleType type, 323 OneClickSigninBubbleType type,
320 const base::string16& email, 324 const base::string16& email,
321 const base::string16& error_message, 325 const base::string16& error_message,
322 const StartSyncCallback& start_sync_callback) override; 326 const StartSyncCallback& start_sync_callback) override;
323 #endif 327 #endif
324 // TODO(beng): Not an override, move somewhere else. 328 // TODO(beng): Not an override, move somewhere else.
325 void SetDownloadShelfVisible(bool visible); 329 void SetDownloadShelfVisible(bool visible);
326 bool IsDownloadShelfVisible() const override; 330 bool IsDownloadShelfVisible() const override;
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 697 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
694 698
695 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 699 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
696 700
697 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 701 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
698 702
699 DISALLOW_COPY_AND_ASSIGN(BrowserView); 703 DISALLOW_COPY_AND_ASSIGN(BrowserView);
700 }; 704 };
701 705
702 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 706 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698