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

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

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the browser test Created 7 years, 2 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 virtual bool IsTabStripEditable() const OVERRIDE; 318 virtual bool IsTabStripEditable() const OVERRIDE;
319 virtual bool IsToolbarVisible() const OVERRIDE; 319 virtual bool IsToolbarVisible() const OVERRIDE;
320 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 320 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
321 virtual void DisableInactiveFrame() OVERRIDE; 321 virtual void DisableInactiveFrame() OVERRIDE;
322 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 322 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
323 Profile* profile) OVERRIDE; 323 Profile* profile) OVERRIDE;
324 virtual void ShowUpdateChromeDialog() OVERRIDE; 324 virtual void ShowUpdateChromeDialog() OVERRIDE;
325 virtual void ShowBookmarkBubble(const GURL& url, 325 virtual void ShowBookmarkBubble(const GURL& url,
326 bool already_bookmarked) OVERRIDE; 326 bool already_bookmarked) OVERRIDE;
327 virtual void ShowBookmarkPrompt() OVERRIDE; 327 virtual void ShowBookmarkPrompt() OVERRIDE;
328 virtual void ShowTranslateBubble(
329 content::WebContents* contents,
330 TranslateBubbleModel::ViewState view_state) OVERRIDE;
328 #if defined(ENABLE_ONE_CLICK_SIGNIN) 331 #if defined(ENABLE_ONE_CLICK_SIGNIN)
329 virtual void ShowOneClickSigninBubble( 332 virtual void ShowOneClickSigninBubble(
330 OneClickSigninBubbleType type, 333 OneClickSigninBubbleType type,
331 const string16& email, 334 const string16& email,
332 const string16& error_message, 335 const string16& error_message,
333 const StartSyncCallback& start_sync_callback) OVERRIDE; 336 const StartSyncCallback& start_sync_callback) OVERRIDE;
334 #endif 337 #endif
335 // TODO(beng): Not an override, move somewhere else. 338 // TODO(beng): Not an override, move somewhere else.
336 void SetDownloadShelfVisible(bool visible); 339 void SetDownloadShelfVisible(bool visible);
337 virtual bool IsDownloadShelfVisible() const OVERRIDE; 340 virtual bool IsDownloadShelfVisible() const OVERRIDE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 const autofill::PasswordForm& form, 373 const autofill::PasswordForm& form,
371 autofill::PasswordGenerator* password_generator) OVERRIDE; 374 autofill::PasswordGenerator* password_generator) OVERRIDE;
372 virtual void OverscrollUpdate(int delta_y) OVERRIDE; 375 virtual void OverscrollUpdate(int delta_y) OVERRIDE;
373 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; 376 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE;
374 377
375 // Overridden from BrowserWindowTesting: 378 // Overridden from BrowserWindowTesting:
376 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; 379 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE;
377 virtual LocationBarView* GetLocationBarView() const OVERRIDE; 380 virtual LocationBarView* GetLocationBarView() const OVERRIDE;
378 virtual views::View* GetTabContentsContainerView() const OVERRIDE; 381 virtual views::View* GetTabContentsContainerView() const OVERRIDE;
379 virtual ToolbarView* GetToolbarView() const OVERRIDE; 382 virtual ToolbarView* GetToolbarView() const OVERRIDE;
383 virtual TranslateBubbleModel* GetTranslateBubbleModel() const OVERRIDE;
380 384
381 // Overridden from TabStripModelObserver: 385 // Overridden from TabStripModelObserver:
382 virtual void TabDetachedAt(content::WebContents* contents, 386 virtual void TabDetachedAt(content::WebContents* contents,
383 int index) OVERRIDE; 387 int index) OVERRIDE;
384 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; 388 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
385 virtual void TabStripEmpty() OVERRIDE; 389 virtual void TabStripEmpty() OVERRIDE;
386 390
387 // Overridden from ui::AcceleratorProvider: 391 // Overridden from ui::AcceleratorProvider:
388 virtual bool GetAcceleratorForCommandId(int command_id, 392 virtual bool GetAcceleratorForCommandId(int command_id,
389 ui::Accelerator* accelerator) OVERRIDE; 393 ui::Accelerator* accelerator) OVERRIDE;
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 750 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
747 751
748 gfx::ScopedSysColorChangeListener color_change_listener_; 752 gfx::ScopedSysColorChangeListener color_change_listener_;
749 753
750 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 754 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
751 755
752 DISALLOW_COPY_AND_ASSIGN(BrowserView); 756 DISALLOW_COPY_AND_ASSIGN(BrowserView);
753 }; 757 };
754 758
755 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 759 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698