Eliminate chrome::IsTrustedWindowWithScheme

chrome/browser/ui/settings_window_manager.h

 // Copyright (c) 2014 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.
 
 #ifndef CHROME_BROWSER_UI_SETTINGS_WINDOW_MANAGER_H_
 #define CHROME_BROWSER_UI_SETTINGS_WINDOW_MANAGER_H_
 
 #include <map>
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "components/sessions/session_id.h"
 
 class Browser;
 class GURL;
 class Profile;
 
 namespace chrome {
 
 class SettingsWindowManagerObserver;
+struct NavigateParams;
 
 // Class for managing settings windows when --enable-settings-window is enabled.
 // TODO(stevenjb): Remove flag comment if enabled by default.
 
 class SettingsWindowManager {
  public:
   static SettingsWindowManager* GetInstance();
 
   void AddObserver(SettingsWindowManagerObserver* observer);
   void RemoveObserver(SettingsWindowManagerObserver* observer);
@@ skipping 11 matching lines @@
 
  private:
   friend struct DefaultSingletonTraits<SettingsWindowManager>;
   typedef std::map<Profile*, SessionID::id_type> ProfileSessionMap;
 
   SettingsWindowManager();
   ~SettingsWindowManager();
 
   ObserverList<SettingsWindowManagerObserver> observers_;
   ProfileSessionMap settings_session_map_;
+  // Persist the most recent Browser NavigateParams so that we can identify
+  // settings browsers during chrome::Navigate() calls.
+  scoped_ptr<NavigateParams> navigate_params_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowManager);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_SETTINGS_WINDOW_MANAGER_H_