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

Side by Side Diff: chrome/browser/ui/browser_navigator.cc

Issue 8302001: Fix memory error in previous CL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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 | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/ui/browser_navigator.h" 5 #include "chrome/browser/ui/browser_navigator.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 327
328 NavigateParams::NavigateParams( 328 NavigateParams::NavigateParams(
329 Browser* a_browser, 329 Browser* a_browser,
330 const GURL& a_url, 330 const GURL& a_url,
331 content::PageTransition a_transition) 331 content::PageTransition a_transition)
332 : url(a_url), 332 : url(a_url),
333 target_contents(NULL), 333 target_contents(NULL),
334 source_contents(NULL), 334 source_contents(NULL),
335 disposition(CURRENT_TAB), 335 disposition(CURRENT_TAB),
336 transition(a_transition), 336 transition(a_transition),
337 is_renderer_initiated(false),
337 tabstrip_index(-1), 338 tabstrip_index(-1),
338 tabstrip_add_types(TabStripModel::ADD_ACTIVE), 339 tabstrip_add_types(TabStripModel::ADD_ACTIVE),
339 window_action(NO_ACTION), 340 window_action(NO_ACTION),
340 user_gesture(true), 341 user_gesture(true),
341 path_behavior(RESPECT), 342 path_behavior(RESPECT),
342 ref_behavior(IGNORE_REF), 343 ref_behavior(IGNORE_REF),
343 browser(a_browser), 344 browser(a_browser),
344 profile(NULL) { 345 profile(NULL) {
345 } 346 }
346 347
347 NavigateParams::NavigateParams(Browser* a_browser, 348 NavigateParams::NavigateParams(Browser* a_browser,
348 TabContentsWrapper* a_target_contents) 349 TabContentsWrapper* a_target_contents)
349 : target_contents(a_target_contents), 350 : target_contents(a_target_contents),
350 source_contents(NULL), 351 source_contents(NULL),
351 disposition(CURRENT_TAB), 352 disposition(CURRENT_TAB),
352 transition(content::PAGE_TRANSITION_LINK), 353 transition(content::PAGE_TRANSITION_LINK),
354 is_renderer_initiated(false),
353 tabstrip_index(-1), 355 tabstrip_index(-1),
354 tabstrip_add_types(TabStripModel::ADD_ACTIVE), 356 tabstrip_add_types(TabStripModel::ADD_ACTIVE),
355 window_action(NO_ACTION), 357 window_action(NO_ACTION),
356 user_gesture(true), 358 user_gesture(true),
357 path_behavior(RESPECT), 359 path_behavior(RESPECT),
358 ref_behavior(IGNORE_REF), 360 ref_behavior(IGNORE_REF),
359 browser(a_browser), 361 browser(a_browser),
360 profile(NULL) { 362 profile(NULL) {
361 } 363 }
362 364
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 } 618 }
617 619
618 bool IsURLAllowedInIncognito(const GURL& url) { 620 bool IsURLAllowedInIncognito(const GURL& url) {
619 return url.scheme() == chrome::kChromeUIScheme && 621 return url.scheme() == chrome::kChromeUIScheme &&
620 (url.host() == chrome::kChromeUISettingsHost || 622 (url.host() == chrome::kChromeUISettingsHost ||
621 url.host() == chrome::kChromeUIExtensionsHost || 623 url.host() == chrome::kChromeUIExtensionsHost ||
622 url.host() == chrome::kChromeUIBookmarksHost); 624 url.host() == chrome::kChromeUIBookmarksHost);
623 } 625 }
624 626
625 } // namespace browser 627 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698