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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

Issue 10538039: Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update copyrights Created 8 years, 6 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/webui/options2/chromeos/internet_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 dictionary->SetBoolean("showViewAccountButton", true); 1120 dictionary->SetBoolean("showViewAccountButton", true);
1121 } 1121 }
1122 } 1122 }
1123 } 1123 }
1124 1124
1125 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const { 1125 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
1126 // TODO(beng): This is an improper direct dependency on Browser. Route this 1126 // TODO(beng): This is an improper direct dependency on Browser. Route this
1127 // through some sort of delegate. 1127 // through some sort of delegate.
1128 Browser* browser = 1128 Browser* browser =
1129 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui())); 1129 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
1130 return browser->window()->GetNativeHandle(); 1130 return browser->window()->GetNativeWindow();
1131 } 1131 }
1132 1132
1133 Browser* InternetOptionsHandler::GetAppropriateBrowser() { 1133 Browser* InternetOptionsHandler::GetAppropriateBrowser() {
1134 return browser::FindOrCreateTabbedBrowser( 1134 return browser::FindOrCreateTabbedBrowser(
1135 ProfileManager::GetDefaultProfileOrOffTheRecord()); 1135 ProfileManager::GetDefaultProfileOrOffTheRecord());
1136 } 1136 }
1137 1137
1138 float InternetOptionsHandler::GetIconScaleFactor() { 1138 float InternetOptionsHandler::GetIconScaleFactor() {
1139 gfx::NativeWindow window = GetNativeWindow(); 1139 gfx::NativeWindow window = GetNativeWindow();
1140 gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(window); 1140 gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(window);
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 if (default_value) 1472 if (default_value)
1473 value_dict->Set("default", default_value->DeepCopy()); 1473 value_dict->Set("default", default_value->DeepCopy());
1474 if (ui_data.managed()) 1474 if (ui_data.managed())
1475 value_dict->SetString("controlledBy", "policy"); 1475 value_dict->SetString("controlledBy", "policy");
1476 else if (ui_data.recommended()) 1476 else if (ui_data.recommended())
1477 value_dict->SetString("controlledBy", "recommended"); 1477 value_dict->SetString("controlledBy", "recommended");
1478 settings->Set(key, value_dict); 1478 settings->Set(key, value_dict);
1479 } 1479 }
1480 1480
1481 } // namespace options2 1481 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698