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

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: Repair merge to head Created 8 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 | 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 static bool RunUnloadEventsHelper(content::WebContents* contents); 407 static bool RunUnloadEventsHelper(content::WebContents* contents);
408 408
409 // Helper function to handle JS out of memory notifications 409 // Helper function to handle JS out of memory notifications
410 static void JSOutOfMemoryHelper(content::WebContents* web_contents); 410 static void JSOutOfMemoryHelper(content::WebContents* web_contents);
411 411
412 // Helper function to register a protocol handler. 412 // Helper function to register a protocol handler.
413 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents, 413 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents,
414 const std::string& protocol, 414 const std::string& protocol,
415 const GURL& url, 415 const GURL& url,
416 const string16& title, 416 const string16& title,
417 bool user_gesture); 417 bool user_gesture,
418 BrowserWindow* window);
418 419
419 // Helper function to register an intent handler. 420 // Helper function to register an intent handler.
420 // |data| is the registered handler data. |user_gesture| is true if the call 421 // |data| is the registered handler data. |user_gesture| is true if the call
421 // was made in the context of a user gesture. 422 // was made in the context of a user gesture.
422 static void RegisterIntentHandlerHelper( 423 static void RegisterIntentHandlerHelper(
423 content::WebContents* web_contents, 424 content::WebContents* web_contents,
424 const webkit_glue::WebIntentServiceData& data, 425 const webkit_glue::WebIntentServiceData& data,
425 bool user_gesture); 426 bool user_gesture);
426 427
427 // Helper function to handle find results. 428 // Helper function to handle find results.
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 bool window_has_shown_; 1049 bool window_has_shown_;
1049 1050
1050 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1051 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1051 // before DidEndColorChooser is called. 1052 // before DidEndColorChooser is called.
1052 scoped_ptr<content::ColorChooser> color_chooser_; 1053 scoped_ptr<content::ColorChooser> color_chooser_;
1053 1054
1054 DISALLOW_COPY_AND_ASSIGN(Browser); 1055 DISALLOW_COPY_AND_ASSIGN(Browser);
1055 }; 1056 };
1056 1057
1057 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1058 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698