Open Options page on top of NTP.

chrome/browser/ui/browser_navigator.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_about_handler.h"
@@ skipping 65 matching lines @@
     const GURL& other,
     const url_canon::Replacements<char>& replacements) {
   if (url == other)
     return true;
 
   GURL url_replaced = url.ReplaceComponents(replacements);
   GURL other_replaced = other.ReplaceComponents(replacements);
   return url_replaced == other_replaced;
 }
 
+}  // anonymous namespace

[James Hawkins, 2011/06/17 17:44:57]

s/anonymous namespace/namespace/

Technically it's an unnamed namespace, but as far as the style guide is
concerned, the closing comment should match the opening declaration, i.e.,
namespace.

[Greg Billock, 2011/06/17 21:16:07]

Done.

+
+namespace browser {
+
 // Returns the index of an existing singleton tab in |params->browser| matching
 // the URL specified in |params|.
 int GetIndexOfSingletonTab(browser::NavigateParams* params) {
   if (params->disposition != SINGLETON_TAB)
     return -1;
 
   // In case the URL was rewritten by the BrowserURLHandler we need to ensure
   // that we do not open another URL that will get redirected to the rewritten
   // URL.
   GURL rewritten_url(params->url);
@@ skipping 24 matching lines @@
         CompareURLsWithReplacements(tab->tab_contents()->GetURL(),
                                     rewritten_url, replacements)) {
       params->target_contents = tab;
       return tab_index;
     }
   }
 
   return -1;
 }
 
+}  // namespace browser
+
+namespace {

[James Hawkins, 2011/06/17 17:44:57]

Why do we have two unnamed namespaces?

[Greg Billock, 2011/06/17 21:16:07]

Just so the diffs are easier to follow. I plan to move GetIndexOfSingletonTab
down next to Navigate.

+
 // Change some of the navigation parameters based on the particular URL.
 // Currently this applies to chrome://settings and the bookmark manager,
 // which we always want to open in a normal (not incognito) window. Guest
 // session is an exception.
 void AdjustNavigateParamsForURL(browser::NavigateParams* params) {
   if (!params->target_contents &&
       params->url.scheme() == chrome::kChromeUIScheme &&
       (params->url.host() == chrome::kChromeUISettingsHost ||
        params->url.host() == chrome::kChromeUIBookmarksHost)) {
     Profile* profile =
@@ skipping 388 matching lines @@
           params->url, params->referrer, params->transition);
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
       params->browser->ActivateTabAt(singleton_index, user_initiated);
   }
 }
 
 }  // namespace browser