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

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: Fix merge 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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 static bool RunUnloadEventsHelper(content::WebContents* contents); 382 static bool RunUnloadEventsHelper(content::WebContents* contents);
383 383
384 // Helper function to handle JS out of memory notifications 384 // Helper function to handle JS out of memory notifications
385 static void JSOutOfMemoryHelper(content::WebContents* web_contents); 385 static void JSOutOfMemoryHelper(content::WebContents* web_contents);
386 386
387 // Helper function to register a protocol handler. 387 // Helper function to register a protocol handler.
388 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents, 388 static void RegisterProtocolHandlerHelper(content::WebContents* web_contents,
389 const std::string& protocol, 389 const std::string& protocol,
390 const GURL& url, 390 const GURL& url,
391 const string16& title, 391 const string16& title,
392 bool user_gesture); 392 bool user_gesture,
393 BrowserWindow* window);
393 394
394 // Helper function to register an intent handler. 395 // Helper function to register an intent handler.
395 // |data| is the registered handler data. |user_gesture| is true if the call 396 // |data| is the registered handler data. |user_gesture| is true if the call
396 // was made in the context of a user gesture. 397 // was made in the context of a user gesture.
397 static void RegisterIntentHandlerHelper( 398 static void RegisterIntentHandlerHelper(
398 content::WebContents* web_contents, 399 content::WebContents* web_contents,
399 const webkit_glue::WebIntentServiceData& data, 400 const webkit_glue::WebIntentServiceData& data,
400 bool user_gesture); 401 bool user_gesture);
401 402
402 // Helper function to handle find results. 403 // Helper function to handle find results.
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 bool window_has_shown_; 925 bool window_has_shown_;
925 926
926 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
927 // before DidEndColorChooser is called. 928 // before DidEndColorChooser is called.
928 scoped_ptr<content::ColorChooser> color_chooser_; 929 scoped_ptr<content::ColorChooser> color_chooser_;
929 930
930 DISALLOW_COPY_AND_ASSIGN(Browser); 931 DISALLOW_COPY_AND_ASSIGN(Browser);
931 }; 932 };
932 933
933 #endif // CHROME_BROWSER_UI_BROWSER_H_ 934 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698