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

Side by Side Diff: Source/core/page/DOMWindow.h

Issue 14773013: Rename BarInfo to BarProp and remove [NoInterfaceObject] attribute (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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
« no previous file with comments | « Source/core/page/BarProp.idl ('k') | Source/core/page/DOMWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 16 matching lines...) Expand all
27 #ifndef DOMWindow_h 27 #ifndef DOMWindow_h
28 #define DOMWindow_h 28 #define DOMWindow_h
29 29
30 #include "core/dom/ContextDestructionObserver.h" 30 #include "core/dom/ContextDestructionObserver.h"
31 #include "core/dom/EventTarget.h" 31 #include "core/dom/EventTarget.h"
32 #include "core/page/FrameDestructionObserver.h" 32 #include "core/page/FrameDestructionObserver.h"
33 #include "core/platform/KURL.h" 33 #include "core/platform/KURL.h"
34 #include "core/platform/Supplementable.h" 34 #include "core/platform/Supplementable.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37 class BarProp;
38 class BarInfo;
39 class CSSRuleList; 38 class CSSRuleList;
40 class CSSStyleDeclaration; 39 class CSSStyleDeclaration;
41 class Console; 40 class Console;
42 class Crypto; 41 class Crypto;
43 class DOMApplicationCache; 42 class DOMApplicationCache;
44 class DOMPoint; 43 class DOMPoint;
45 class DOMSelection; 44 class DOMSelection;
46 class DOMURL; 45 class DOMURL;
47 class DOMWindowProperty; 46 class DOMWindowProperty;
48 class Database; 47 class Database;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 bool allowPopUp(); // Call on first window, not target window. 121 bool allowPopUp(); // Call on first window, not target window.
123 static bool allowPopUp(Frame* firstFrame); 122 static bool allowPopUp(Frame* firstFrame);
124 static bool canShowModalDialog(const Frame*); 123 static bool canShowModalDialog(const Frame*);
125 static bool canShowModalDialogNow(const Frame*); 124 static bool canShowModalDialogNow(const Frame*);
126 125
127 // DOM Level 0 126 // DOM Level 0
128 127
129 Screen* screen() const; 128 Screen* screen() const;
130 History* history() const; 129 History* history() const;
131 Crypto* crypto() const; 130 Crypto* crypto() const;
132 BarInfo* locationbar() const; 131 BarProp* locationbar() const;
133 BarInfo* menubar() const; 132 BarProp* menubar() const;
134 BarInfo* personalbar() const; 133 BarProp* personalbar() const;
135 BarInfo* scrollbars() const; 134 BarProp* scrollbars() const;
136 BarInfo* statusbar() const; 135 BarProp* statusbar() const;
137 BarInfo* toolbar() const; 136 BarProp* toolbar() const;
138 Navigator* navigator() const; 137 Navigator* navigator() const;
139 Navigator* clientInformation() const { return navigator(); } 138 Navigator* clientInformation() const { return navigator(); }
140 139
141 Location* location() const; 140 Location* location() const;
142 void setLocation(const String& location, DOMWindow* activeWindow, DOMWin dow* firstWindow, 141 void setLocation(const String& location, DOMWindow* activeWindow, DOMWin dow* firstWindow,
143 SetLocationLocking = LockHistoryBasedOnGestureState); 142 SetLocationLocking = LockHistoryBasedOnGestureState);
144 143
145 DOMSelection* getSelection(); 144 DOMSelection* getSelection();
146 145
147 Element* frameElement() const; 146 Element* frameElement() const;
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 void resetDOMWindowProperties(); 403 void resetDOMWindowProperties();
405 void willDestroyDocumentInFrame(); 404 void willDestroyDocumentInFrame();
406 405
407 bool m_shouldPrintWhenFinishedLoading; 406 bool m_shouldPrintWhenFinishedLoading;
408 407
409 HashSet<DOMWindowProperty*> m_properties; 408 HashSet<DOMWindowProperty*> m_properties;
410 409
411 mutable RefPtr<Screen> m_screen; 410 mutable RefPtr<Screen> m_screen;
412 mutable RefPtr<History> m_history; 411 mutable RefPtr<History> m_history;
413 mutable RefPtr<Crypto> m_crypto; 412 mutable RefPtr<Crypto> m_crypto;
414 mutable RefPtr<BarInfo> m_locationbar; 413 mutable RefPtr<BarProp> m_locationbar;
415 mutable RefPtr<BarInfo> m_menubar; 414 mutable RefPtr<BarProp> m_menubar;
416 mutable RefPtr<BarInfo> m_personalbar; 415 mutable RefPtr<BarProp> m_personalbar;
417 mutable RefPtr<BarInfo> m_scrollbars; 416 mutable RefPtr<BarProp> m_scrollbars;
418 mutable RefPtr<BarInfo> m_statusbar; 417 mutable RefPtr<BarProp> m_statusbar;
419 mutable RefPtr<BarInfo> m_toolbar; 418 mutable RefPtr<BarProp> m_toolbar;
420 mutable RefPtr<Console> m_console; 419 mutable RefPtr<Console> m_console;
421 mutable RefPtr<Navigator> m_navigator; 420 mutable RefPtr<Navigator> m_navigator;
422 mutable RefPtr<Location> m_location; 421 mutable RefPtr<Location> m_location;
423 mutable RefPtr<StyleMedia> m_media; 422 mutable RefPtr<StyleMedia> m_media;
424 423
425 EventTargetData m_eventTargetData; 424 EventTargetData m_eventTargetData;
426 425
427 String m_status; 426 String m_status;
428 String m_defaultStatus; 427 String m_defaultStatus;
429 428
(...skipping 12 matching lines...) Expand all
442 } 441 }
443 442
444 inline String DOMWindow::defaultStatus() const 443 inline String DOMWindow::defaultStatus() const
445 { 444 {
446 return m_defaultStatus; 445 return m_defaultStatus;
447 } 446 }
448 447
449 } // namespace WebCore 448 } // namespace WebCore
450 449
451 #endif // DOMWindow_h 450 #endif // DOMWindow_h
OLDNEW
« no previous file with comments | « Source/core/page/BarProp.idl ('k') | Source/core/page/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698