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

Side by Side Diff: chrome/renderer/navigation_state.cc

Issue 6099013: Fix race condition where chrome.tabs.executeScript sometimes wouldn't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile Created 9 years, 11 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
« no previous file with comments | « chrome/renderer/navigation_state.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/renderer/navigation_state.h" 5 #include "chrome/renderer/navigation_state.h"
6 6
7 #include "chrome/renderer/user_script_idle_scheduler.h" 7 #include "chrome/renderer/user_script_idle_scheduler.h"
8 #include "webkit/glue/alt_error_page_resource_fetcher.h" 8 #include "webkit/glue/alt_error_page_resource_fetcher.h"
9 #include "webkit/glue/password_form.h" 9 #include "webkit/glue/password_form.h"
10 10
11 NavigationState::~NavigationState() {} 11 NavigationState::~NavigationState() {}
12 12
13 void NavigationState::set_user_script_idle_scheduler( 13 void NavigationState::set_user_script_idle_scheduler(
14 UserScriptIdleScheduler* scheduler) { 14 UserScriptIdleScheduler* scheduler) {
15 user_script_idle_scheduler_.reset(scheduler); 15 user_script_idle_scheduler_.reset(scheduler);
16 } 16 }
17 17
18 void NavigationState::swap_user_script_idle_scheduler(
19 NavigationState* state) {
20 user_script_idle_scheduler_.swap(state->user_script_idle_scheduler_);
21 }
22
18 void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) { 23 void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) {
19 password_form_data_.reset(data); 24 password_form_data_.reset(data);
20 } 25 }
21 26
22 void NavigationState::set_alt_error_page_fetcher( 27 void NavigationState::set_alt_error_page_fetcher(
23 webkit_glue::AltErrorPageResourceFetcher* f) { 28 webkit_glue::AltErrorPageResourceFetcher* f) {
24 alt_error_page_fetcher_.reset(f); 29 alt_error_page_fetcher_.reset(f);
25 } 30 }
26 31
27 NavigationState::NavigationState(PageTransition::Type transition_type, 32 NavigationState::NavigationState(PageTransition::Type transition_type,
(...skipping 16 matching lines...) Expand all
44 http_status_code_(0), 49 http_status_code_(0),
45 was_fetched_via_spdy_(false), 50 was_fetched_via_spdy_(false),
46 was_npn_negotiated_(false), 51 was_npn_negotiated_(false),
47 was_alternate_protocol_available_(false), 52 was_alternate_protocol_available_(false),
48 was_fetched_via_proxy_(false), 53 was_fetched_via_proxy_(false),
49 was_translated_(false), 54 was_translated_(false),
50 was_within_same_page_(false), 55 was_within_same_page_(false),
51 was_prefetcher_(false), 56 was_prefetcher_(false),
52 was_referred_by_prefetcher_(false) { 57 was_referred_by_prefetcher_(false) {
53 } 58 }
OLDNEW
« no previous file with comments | « chrome/renderer/navigation_state.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698