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

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: Make windows happy 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 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 static bool RunUnloadEventsHelper(content::WebContents* contents); 600 static bool RunUnloadEventsHelper(content::WebContents* contents);
601 601
602 // Helper function to handle JS out of memory notifications 602 // Helper function to handle JS out of memory notifications
603 static void JSOutOfMemoryHelper(content::WebContents* web_contents); 603 static void JSOutOfMemoryHelper(content::WebContents* web_contents);
604 604
605 // Helper function to register a protocol handler. 605 // Helper function to register a protocol handler.
606 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents, 606 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents,
607 const std::string& protocol, 607 const std::string& protocol,
608 const GURL& url, 608 const GURL& url,
609 const string16& title, 609 const string16& title,
610 bool user_gesture); 610 bool user_gesture,
611 BrowserWindow* window);
611 612
612 // Helper function to register an intent handler. 613 // Helper function to register an intent handler.
613 // |data| is the registered handler data. |user_gesture| is true if the call 614 // |data| is the registered handler data. |user_gesture| is true if the call
614 // was made in the context of a user gesture. 615 // was made in the context of a user gesture.
615 static void RegisterIntentHandlerHelper( 616 static void RegisterIntentHandlerHelper(
616 content::WebContents* web_contents, 617 content::WebContents* web_contents,
617 const webkit_glue::WebIntentServiceData& data, 618 const webkit_glue::WebIntentServiceData& data,
618 bool user_gesture); 619 bool user_gesture);
619 620
620 // Helper function to handle find results. 621 // Helper function to handle find results.
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 bool window_has_shown_; 1393 bool window_has_shown_;
1393 1394
1394 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1395 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1395 // before DidEndColorChooser is called. 1396 // before DidEndColorChooser is called.
1396 scoped_ptr<content::ColorChooser> color_chooser_; 1397 scoped_ptr<content::ColorChooser> color_chooser_;
1397 1398
1398 DISALLOW_COPY_AND_ASSIGN(Browser); 1399 DISALLOW_COPY_AND_ASSIGN(Browser);
1399 }; 1400 };
1400 1401
1401 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1402 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698