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

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

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 static bool RunUnloadEventsHelper(content::WebContents* contents); 666 static bool RunUnloadEventsHelper(content::WebContents* contents);
667 667
668 // Helper function to handle JS out of memory notifications 668 // Helper function to handle JS out of memory notifications
669 static void JSOutOfMemoryHelper(content::WebContents* web_contents); 669 static void JSOutOfMemoryHelper(content::WebContents* web_contents);
670 670
671 // Helper function to register a protocol handler. 671 // Helper function to register a protocol handler.
672 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents, 672 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents,
673 const std::string& protocol, 673 const std::string& protocol,
674 const GURL& url, 674 const GURL& url,
675 const string16& title, 675 const string16& title,
676 bool user_gesture); 676 bool user_gesture,
677 BrowserWindow* window);
677 678
678 // Helper function to register an intent handler. 679 // Helper function to register an intent handler.
679 // |data| is the registered handler data. |user_gesture| is true if the call 680 // |data| is the registered handler data. |user_gesture| is true if the call
680 // was made in the context of a user gesture. 681 // was made in the context of a user gesture.
681 static void RegisterIntentHandlerHelper( 682 static void RegisterIntentHandlerHelper(
682 content::WebContents* web_contents, 683 content::WebContents* web_contents,
683 const webkit_glue::WebIntentServiceData& data, 684 const webkit_glue::WebIntentServiceData& data,
684 bool user_gesture); 685 bool user_gesture);
685 686
686 // Helper function to handle find results. 687 // Helper function to handle find results.
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 bool window_has_shown_; 1462 bool window_has_shown_;
1462 1463
1463 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1464 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1464 // before DidEndColorChooser is called. 1465 // before DidEndColorChooser is called.
1465 scoped_ptr<content::ColorChooser> color_chooser_; 1466 scoped_ptr<content::ColorChooser> color_chooser_;
1466 1467
1467 DISALLOW_COPY_AND_ASSIGN(Browser); 1468 DISALLOW_COPY_AND_ASSIGN(Browser);
1468 }; 1469 };
1469 1470
1470 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1471 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698