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

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

Issue 10897034: First part of PAGE_TRANSITION_START_PAGE cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 3 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 #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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 452
453 // Determine if the navigation was user initiated. If it was, we need to 453 // Determine if the navigation was user initiated. If it was, we need to
454 // inform the target TabContents, and we may need to update the UI. 454 // inform the target TabContents, and we may need to update the UI.
455 content::PageTransition base_transition = 455 content::PageTransition base_transition =
456 content::PageTransitionStripQualifier(params->transition); 456 content::PageTransitionStripQualifier(params->transition);
457 bool user_initiated = 457 bool user_initiated =
458 params->transition & content::PAGE_TRANSITION_FROM_ADDRESS_BAR || 458 params->transition & content::PAGE_TRANSITION_FROM_ADDRESS_BAR ||
459 base_transition == content::PAGE_TRANSITION_TYPED || 459 base_transition == content::PAGE_TRANSITION_TYPED ||
460 base_transition == content::PAGE_TRANSITION_AUTO_BOOKMARK || 460 base_transition == content::PAGE_TRANSITION_AUTO_BOOKMARK ||
461 base_transition == content::PAGE_TRANSITION_GENERATED || 461 base_transition == content::PAGE_TRANSITION_GENERATED ||
462 base_transition == content::PAGE_TRANSITION_START_PAGE || 462 base_transition == content::PAGE_TRANSITION_AUTO_TOPLEVEL ||
463 base_transition == content::PAGE_TRANSITION_RELOAD || 463 base_transition == content::PAGE_TRANSITION_RELOAD ||
464 base_transition == content::PAGE_TRANSITION_KEYWORD; 464 base_transition == content::PAGE_TRANSITION_KEYWORD;
465 465
466 std::string extra_headers; 466 std::string extra_headers;
467 467
468 // Check if this is a singleton tab that already exists 468 // Check if this is a singleton tab that already exists
469 int singleton_index = chrome::GetIndexOfSingletonTab(params); 469 int singleton_index = chrome::GetIndexOfSingletonTab(params);
470 470
471 // If no target TabContents was specified, we need to construct one if 471 // If no target TabContents was specified, we need to construct one if
472 // we are supposed to target a new tab; unless it's a singleton that already 472 // we are supposed to target a new tab; unless it's a singleton that already
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 return !(url.scheme() == chrome::kChromeUIScheme && 601 return !(url.scheme() == chrome::kChromeUIScheme &&
602 (url.host() == chrome::kChromeUISettingsHost || 602 (url.host() == chrome::kChromeUISettingsHost ||
603 url.host() == chrome::kChromeUISettingsFrameHost || 603 url.host() == chrome::kChromeUISettingsFrameHost ||
604 url.host() == chrome::kChromeUIExtensionsHost || 604 url.host() == chrome::kChromeUIExtensionsHost ||
605 url.host() == chrome::kChromeUIBookmarksHost || 605 url.host() == chrome::kChromeUIBookmarksHost ||
606 url.host() == chrome::kChromeUISyncPromoHost || 606 url.host() == chrome::kChromeUISyncPromoHost ||
607 url.host() == chrome::kChromeUIUberHost)); 607 url.host() == chrome::kChromeUIUberHost));
608 } 608 }
609 609
610 } // namespace chrome 610 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_close_browsertest.cc ('k') | chrome/browser/ui/cocoa/web_dialog_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698