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

Unified Diff: chrome/browser/ui/webui/options/options_handlers_helper.cc

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, nits (rename) Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/options_handlers_helper.cc
diff --git a/chrome/browser/ui/webui/options/options_handlers_helper.cc b/chrome/browser/ui/webui/options/options_handlers_helper.cc
index f754eacb41ce5c3cb530d3e70144061129a6d795..3f43637f7e33f07ab9c1398845a4c7cfab50909e 100644
--- a/chrome/browser/ui/webui/options/options_handlers_helper.cc
+++ b/chrome/browser/ui/webui/options/options_handlers_helper.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
#include "base/bind.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -24,12 +24,12 @@ chrome::HostDesktopType GetDesktopType(content::WebUI* web_ui) {
if (browser)
return browser->host_desktop_type();
- apps::ShellWindow* shell_window =
- apps::ShellWindowRegistry::Get(Profile::FromWebUI(web_ui))->
- GetShellWindowForRenderViewHost(web_contents->GetRenderViewHost());
- if (shell_window) {
+ apps::AppWindow* app_window =
+ apps::AppWindowRegistry::Get(Profile::FromWebUI(web_ui))
+ ->GetAppWindowForRenderViewHost(web_contents->GetRenderViewHost());
+ if (app_window) {
return chrome::GetHostDesktopTypeForNativeWindow(
- shell_window->GetNativeWindow());
+ app_window->GetNativeWindow());
}
return chrome::GetActiveDesktop();
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698