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

Unified Diff: ash/keyboard_overlay/keyboard_overlay_delegate.cc

Issue 10824023: Revert "Revert 148383 - Move the keyboard overlay view to ash." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « ash/keyboard_overlay/keyboard_overlay_delegate.h ('k') | ash/keyboard_overlay/keyboard_overlay_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/keyboard_overlay/keyboard_overlay_delegate.cc
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/ash/keyboard_overlay/keyboard_overlay_delegate.cc
similarity index 93%
rename from chrome/browser/ui/views/keyboard_overlay_delegate.cc
rename to ash/keyboard_overlay/keyboard_overlay_delegate.cc
index 051979e9c66414fb4aeff3b0031bae024f9af353..e819a98147358dd29b87850649f86efb4386b19d 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc
+++ b/ash/keyboard_overlay/keyboard_overlay_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
+#include "ash/keyboard_overlay/keyboard_overlay_delegate.h"
#include <algorithm>
@@ -10,11 +10,8 @@
#include "base/memory/weak_ptr.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/common/url_constants.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_message_handler.h"
-#include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/screen.h"
#include "ui/views/controls/webview/web_dialog_view.h"
@@ -61,8 +58,10 @@ void PaintMessageHandler::DidPaint(const ListValue* args) {
} // namespace
-KeyboardOverlayDelegate::KeyboardOverlayDelegate(const string16& title)
+KeyboardOverlayDelegate::KeyboardOverlayDelegate(const string16& title,
+ const GURL& url)
: title_(title),
+ url_(url),
view_(NULL) {
}
@@ -101,8 +100,7 @@ string16 KeyboardOverlayDelegate::GetDialogTitle() const {
}
GURL KeyboardOverlayDelegate::GetDialogContentURL() const {
- std::string url_string(chrome::kChromeUIKeyboardOverlayURL);
- return GURL(url_string);
+ return url_;
}
void KeyboardOverlayDelegate::GetWebUIMessageHandlers(
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_delegate.h ('k') | ash/keyboard_overlay/keyboard_overlay_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698