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

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 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 static bool RunUnloadEventsHelper(content::WebContents* contents); 476 static bool RunUnloadEventsHelper(content::WebContents* contents);
477 477
478 // Helper function to handle JS out of memory notifications 478 // Helper function to handle JS out of memory notifications
479 static void JSOutOfMemoryHelper(content::WebContents* web_contents); 479 static void JSOutOfMemoryHelper(content::WebContents* web_contents);
480 480
481 // Helper function to register a protocol handler. 481 // Helper function to register a protocol handler.
482 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents, 482 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents,
483 const std::string& protocol, 483 const std::string& protocol,
484 const GURL& url, 484 const GURL& url,
485 const string16& title, 485 const string16& title,
486 bool user_gesture); 486 bool user_gesture,
487 BrowserWindow* window);
487 488
488 // Helper function to register an intent handler. 489 // Helper function to register an intent handler.
489 // |data| is the registered handler data. |user_gesture| is true if the call 490 // |data| is the registered handler data. |user_gesture| is true if the call
490 // was made in the context of a user gesture. 491 // was made in the context of a user gesture.
491 static void RegisterIntentHandlerHelper( 492 static void RegisterIntentHandlerHelper(
492 content::WebContents* web_contents, 493 content::WebContents* web_contents,
493 const webkit_glue::WebIntentServiceData& data, 494 const webkit_glue::WebIntentServiceData& data,
494 bool user_gesture); 495 bool user_gesture);
495 496
496 // Helper function to handle find results. 497 // Helper function to handle find results.
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 bool window_has_shown_; 1251 bool window_has_shown_;
1251 1252
1252 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1253 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1253 // before DidEndColorChooser is called. 1254 // before DidEndColorChooser is called.
1254 scoped_ptr<content::ColorChooser> color_chooser_; 1255 scoped_ptr<content::ColorChooser> color_chooser_;
1255 1256
1256 DISALLOW_COPY_AND_ASSIGN(Browser); 1257 DISALLOW_COPY_AND_ASSIGN(Browser);
1257 }; 1258 };
1258 1259
1259 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1260 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698