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

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

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 years, 10 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
« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/browser.cc » ('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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, 604 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
605 bool enter_fullscreen) OVERRIDE; 605 bool enter_fullscreen) OVERRIDE;
606 virtual bool IsFullscreenForTabOrPending( 606 virtual bool IsFullscreenForTabOrPending(
607 const content::WebContents* web_contents) const OVERRIDE; 607 const content::WebContents* web_contents) const OVERRIDE;
608 virtual void JSOutOfMemory(content::WebContents* web_contents) OVERRIDE; 608 virtual void JSOutOfMemory(content::WebContents* web_contents) OVERRIDE;
609 virtual void RegisterProtocolHandler(content::WebContents* web_contents, 609 virtual void RegisterProtocolHandler(content::WebContents* web_contents,
610 const std::string& protocol, 610 const std::string& protocol,
611 const GURL& url, 611 const GURL& url,
612 const string16& title, 612 const string16& title,
613 bool user_gesture) OVERRIDE; 613 bool user_gesture) OVERRIDE;
614 #if defined(ENABLE_WEB_INTENTS)
614 virtual void RegisterIntentHandler( 615 virtual void RegisterIntentHandler(
615 content::WebContents* web_contents, 616 content::WebContents* web_contents,
616 const webkit_glue::WebIntentServiceData& data, 617 const webkit_glue::WebIntentServiceData& data,
617 bool user_gesture) OVERRIDE; 618 bool user_gesture) OVERRIDE;
618 virtual void WebIntentDispatch( 619 virtual void WebIntentDispatch(
619 content::WebContents* web_contents, 620 content::WebContents* web_contents,
620 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE; 621 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;
622 #endif
621 virtual void UpdatePreferredSize(content::WebContents* source, 623 virtual void UpdatePreferredSize(content::WebContents* source,
622 const gfx::Size& pref_size) OVERRIDE; 624 const gfx::Size& pref_size) OVERRIDE;
623 virtual void ResizeDueToAutoResize(content::WebContents* source, 625 virtual void ResizeDueToAutoResize(content::WebContents* source,
624 const gfx::Size& new_size) OVERRIDE; 626 const gfx::Size& new_size) OVERRIDE;
625 virtual void FindReply(content::WebContents* web_contents, 627 virtual void FindReply(content::WebContents* web_contents,
626 int request_id, 628 int request_id,
627 int number_of_matches, 629 int number_of_matches,
628 const gfx::Rect& selection_rect, 630 const gfx::Rect& selection_rect,
629 int active_match_ordinal, 631 int active_match_ordinal,
630 bool final_update) OVERRIDE; 632 bool final_update) OVERRIDE;
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 bool window_has_shown_; 932 bool window_has_shown_;
931 933
932 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
933 // before DidEndColorChooser is called. 935 // before DidEndColorChooser is called.
934 scoped_ptr<content::ColorChooser> color_chooser_; 936 scoped_ptr<content::ColorChooser> color_chooser_;
935 937
936 DISALLOW_COPY_AND_ASSIGN(Browser); 938 DISALLOW_COPY_AND_ASSIGN(Browser);
937 }; 939 };
938 940
939 #endif // CHROME_BROWSER_UI_BROWSER_H_ 941 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698