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

Side by Side Diff: chrome/browser/ui/webui/keyboard_ui.h

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
6 #define CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_ 6 #define CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 11 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
12 #include "content/browser/webui/web_ui.h"
13 #include "content/public/browser/web_ui_controller.h" 12 #include "content/public/browser/web_ui_controller.h"
14 13
15 // The TabContents used for the keyboard page. 14 // The TabContents used for the keyboard page.
16 class KeyboardUI : public WebUI, public content::WebUIController { 15 class KeyboardUI : public content::WebUIController {
17 public: 16 public:
18 explicit KeyboardUI(content::WebContents* manager); 17 explicit KeyboardUI(WebUI* web_ui);
19 virtual ~KeyboardUI(); 18 virtual ~KeyboardUI();
20 19
21 class KeyboardHTMLSource : public ChromeURLDataManager::DataSource { 20 class KeyboardHTMLSource : public ChromeURLDataManager::DataSource {
22 public: 21 public:
23 KeyboardHTMLSource(); 22 KeyboardHTMLSource();
24 23
25 // Overrides from DataSource 24 // Overrides from DataSource
26 virtual void StartDataRequest(const std::string& path, 25 virtual void StartDataRequest(const std::string& path,
27 bool is_incognito, 26 bool is_incognito,
28 int request_id) OVERRIDE; 27 int request_id) OVERRIDE;
29 virtual std::string GetMimeType(const std::string&) const OVERRIDE; 28 virtual std::string GetMimeType(const std::string&) const OVERRIDE;
30 29
31 private: 30 private:
32 virtual ~KeyboardHTMLSource() {} 31 virtual ~KeyboardHTMLSource() {}
33 32
34 DISALLOW_COPY_AND_ASSIGN(KeyboardHTMLSource); 33 DISALLOW_COPY_AND_ASSIGN(KeyboardHTMLSource);
35 }; 34 };
36 35
37 private: 36 private:
38 DISALLOW_COPY_AND_ASSIGN(KeyboardUI); 37 DISALLOW_COPY_AND_ASSIGN(KeyboardUI);
39 }; 38 };
40 39
41 #endif // CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_ 40 #endif // CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698