content/browser/web_contents/web_contents_impl.h - Issue 232463007: Don't leave aborted URLs in the omnibox unless we're on a new tab.

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 232463007: Don't leave aborted URLs in the omnibox unless we're on a new tab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix and add tests. Created 6 years, 8 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

« content/browser/frame_host/navigation_controller_impl_unittest.cc ('K') | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | content/public/browser/web_contents_delegate.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10 #include <string>	10 #include <string>

(...skipping 471 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
482 virtual void NotifyChangedNavigationState(	482 virtual void NotifyChangedNavigationState(

483 InvalidateTypes changed_flags) OVERRIDE;	483 InvalidateTypes changed_flags) OVERRIDE;

484 virtual void AboutToNavigateRenderFrame(	484 virtual void AboutToNavigateRenderFrame(

485 RenderFrameHostImpl* render_frame_host) OVERRIDE;	485 RenderFrameHostImpl* render_frame_host) OVERRIDE;

486 virtual void DidStartNavigationToPendingEntry(	486 virtual void DidStartNavigationToPendingEntry(

487 RenderFrameHostImpl* render_frame_host,	487 RenderFrameHostImpl* render_frame_host,

488 const GURL& url,	488 const GURL& url,

489 NavigationController::ReloadType reload_type) OVERRIDE;	489 NavigationController::ReloadType reload_type) OVERRIDE;

490 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host,	490 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host,

491 const OpenURLParams& params) OVERRIDE;	491 const OpenURLParams& params) OVERRIDE;

	492 virtual bool ShouldPreserveAbortedURLs() OVERRIDE;

492	493

493 // RenderWidgetHostDelegate --------------------------------------------------	494 // RenderWidgetHostDelegate --------------------------------------------------

494	495

495 virtual void RenderWidgetDeleted(	496 virtual void RenderWidgetDeleted(

496 RenderWidgetHostImpl* render_widget_host) OVERRIDE;	497 RenderWidgetHostImpl* render_widget_host) OVERRIDE;

497 virtual bool PreHandleKeyboardEvent(	498 virtual bool PreHandleKeyboardEvent(

498 const NativeWebKeyboardEvent& event,	499 const NativeWebKeyboardEvent& event,

499 bool* is_keyboard_shortcut) OVERRIDE;	500 bool* is_keyboard_shortcut) OVERRIDE;

500 virtual void HandleKeyboardEvent(	501 virtual void HandleKeyboardEvent(

501 const NativeWebKeyboardEvent& event) OVERRIDE;	502 const NativeWebKeyboardEvent& event) OVERRIDE;

(...skipping 571 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1073	1074

1074 // Whether the last JavaScript dialog shown was suppressed. Used for testing.	1075 // Whether the last JavaScript dialog shown was suppressed. Used for testing.

1075 bool last_dialog_suppressed_;	1076 bool last_dialog_suppressed_;

1076	1077

1077 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);	1078 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);

1078 };	1079 };

1079	1080

1080 } // namespace content	1081 } // namespace content

1081	1082

1082 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	1083 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

OLD	NEW