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

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

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors Created 6 years, 5 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
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 virtual bool IsToolbarVisible() const OVERRIDE; 99 virtual bool IsToolbarVisible() const OVERRIDE;
100 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 100 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
101 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 101 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
102 Profile* profile) OVERRIDE; 102 Profile* profile) OVERRIDE;
103 virtual void ShowUpdateChromeDialog() OVERRIDE; 103 virtual void ShowUpdateChromeDialog() OVERRIDE;
104 virtual void ShowBookmarkBubble(const GURL& url, 104 virtual void ShowBookmarkBubble(const GURL& url,
105 bool already_bookmarked) OVERRIDE; 105 bool already_bookmarked) OVERRIDE;
106 virtual void ShowBookmarkAppBubble( 106 virtual void ShowBookmarkAppBubble(
107 const WebApplicationInfo& web_app_info, 107 const WebApplicationInfo& web_app_info,
108 const std::string& extension_id) OVERRIDE; 108 const std::string& extension_id) OVERRIDE;
109 virtual void ShowTranslateBubble(content::WebContents* contents, 109 virtual void ShowTranslateBubble(
110 translate::TranslateStep step, 110 content::WebContents* contents,
111 TranslateErrors::Type error_type) OVERRIDE; 111 translate::TranslateStep step,
112 translate::TranslateErrors::Type error_type) OVERRIDE;
112 #if defined(ENABLE_ONE_CLICK_SIGNIN) 113 #if defined(ENABLE_ONE_CLICK_SIGNIN)
113 virtual void ShowOneClickSigninBubble( 114 virtual void ShowOneClickSigninBubble(
114 OneClickSigninBubbleType type, 115 OneClickSigninBubbleType type,
115 const base::string16& email, 116 const base::string16& email,
116 const base::string16& error_message, 117 const base::string16& error_message,
117 const StartSyncCallback& start_sync_callback) OVERRIDE; 118 const StartSyncCallback& start_sync_callback) OVERRIDE;
118 #endif 119 #endif
119 virtual bool IsDownloadShelfVisible() const OVERRIDE; 120 virtual bool IsDownloadShelfVisible() const OVERRIDE;
120 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; 121 virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
121 virtual void ConfirmBrowserCloseWithPendingDownloads( 122 virtual void ConfirmBrowserCloseWithPendingDownloads(
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 186 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
186 187
187 Browser* browser_; // weak, owned by controller 188 Browser* browser_; // weak, owned by controller
188 BrowserWindowController* controller_; // weak, owns us 189 BrowserWindowController* controller_; // weak, owns us
189 base::scoped_nsobject<NSString> pending_window_title_; 190 base::scoped_nsobject<NSString> pending_window_title_;
190 ui::WindowShowState initial_show_state_; 191 ui::WindowShowState initial_show_state_;
191 NSInteger attention_request_id_; // identifier from requestUserAttention 192 NSInteger attention_request_id_; // identifier from requestUserAttention
192 }; 193 };
193 194
194 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698