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

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

Issue 9837074: Make it so that allow_js_access: false can be used with background pages created by window.open. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revised approach based on http://crrev.com/125180. Created 8 years, 9 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 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 const NativeWebKeyboardEvent& event) OVERRIDE; 1027 const NativeWebKeyboardEvent& event) OVERRIDE;
1028 virtual void ShowRepostFormWarningDialog( 1028 virtual void ShowRepostFormWarningDialog(
1029 content::WebContents* source) OVERRIDE; 1029 content::WebContents* source) OVERRIDE;
1030 virtual bool ShouldAddNavigationToHistory( 1030 virtual bool ShouldAddNavigationToHistory(
1031 const history::HistoryAddPageArgs& add_page_args, 1031 const history::HistoryAddPageArgs& add_page_args,
1032 content::NavigationType navigation_type) OVERRIDE; 1032 content::NavigationType navigation_type) OVERRIDE;
1033 virtual bool ShouldCreateWebContents( 1033 virtual bool ShouldCreateWebContents(
1034 content::WebContents* web_contents, 1034 content::WebContents* web_contents,
1035 int route_id, 1035 int route_id,
1036 WindowContainerType window_container_type, 1036 WindowContainerType window_container_type,
1037 const string16& frame_name) OVERRIDE; 1037 const string16& frame_name,
1038 const GURL& target_url) OVERRIDE;
1038 virtual void WebContentsCreated(content::WebContents* source_contents, 1039 virtual void WebContentsCreated(content::WebContents* source_contents,
1039 int64 source_frame_id, 1040 int64 source_frame_id,
1040 const GURL& target_url, 1041 const GURL& target_url,
1041 content::WebContents* new_contents) OVERRIDE; 1042 content::WebContents* new_contents) OVERRIDE;
1042 virtual void ContentRestrictionsChanged( 1043 virtual void ContentRestrictionsChanged(
1043 content::WebContents* source) OVERRIDE; 1044 content::WebContents* source) OVERRIDE;
1044 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; 1045 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
1045 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; 1046 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
1046 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; 1047 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
1047 virtual void DidNavigateMainFramePostCommit( 1048 virtual void DidNavigateMainFramePostCommit(
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 // Resets |bookmark_bar_state_| based on the active tab. Notifies the 1348 // Resets |bookmark_bar_state_| based on the active tab. Notifies the
1348 // BrowserWindow if necessary. 1349 // BrowserWindow if necessary.
1349 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); 1350 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason);
1350 1351
1351 // Open the bookmark manager with a defined hash action. 1352 // Open the bookmark manager with a defined hash action.
1352 void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id); 1353 void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id);
1353 1354
1354 // Creates a BackgroundContents if appropriate; return true if one was 1355 // Creates a BackgroundContents if appropriate; return true if one was
1355 // created. 1356 // created.
1356 bool MaybeCreateBackgroundContents(int route_id, 1357 bool MaybeCreateBackgroundContents(int route_id,
1357 content::SiteInstance* site, 1358 content::WebContents* opener_web_contents,
1358 const GURL& opener_url, 1359 const string16& frame_name,
1359 const string16& frame_name); 1360 const GURL& target_url);
1360 1361
1361 // Data members ///////////////////////////////////////////////////////////// 1362 // Data members /////////////////////////////////////////////////////////////
1362 1363
1363 content::NotificationRegistrar registrar_; 1364 content::NotificationRegistrar registrar_;
1364 1365
1365 PrefChangeRegistrar profile_pref_registrar_; 1366 PrefChangeRegistrar profile_pref_registrar_;
1366 1367
1367 PrefChangeRegistrar local_pref_registrar_; 1368 PrefChangeRegistrar local_pref_registrar_;
1368 1369
1369 // This Browser's type. 1370 // This Browser's type.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 bool window_has_shown_; 1517 bool window_has_shown_;
1517 1518
1518 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1519 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1519 // before DidEndColorChooser is called. 1520 // before DidEndColorChooser is called.
1520 scoped_ptr<content::ColorChooser> color_chooser_; 1521 scoped_ptr<content::ColorChooser> color_chooser_;
1521 1522
1522 DISALLOW_COPY_AND_ASSIGN(Browser); 1523 DISALLOW_COPY_AND_ASSIGN(Browser);
1523 }; 1524 };
1524 1525
1525 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1526 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698