chrome/browser/ui/webui/options/chromeos/about_page_handler.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/about_page_handler.cc

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

« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/options/chromeos/about_page_handler.h"	5 #include "chrome/browser/ui/webui/options/chromeos/about_page_handler.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/i18n/time_formatting.h"	13 #include "base/i18n/time_formatting.h"

14 #include "base/string16.h"	14 #include "base/string16.h"

15 #include "base/string_number_conversions.h"	15 #include "base/string_number_conversions.h"

16 #include "base/time.h"	16 #include "base/time.h"

17 #include "base/utf_string_conversions.h"	17 #include "base/utf_string_conversions.h"

18 #include "base/values.h"	18 #include "base/values.h"

19 #include "chrome/browser/browser_process.h"	19 #include "chrome/browser/browser_process.h"

20 #include "chrome/browser/chromeos/cros_settings.h"	20 #include "chrome/browser/chromeos/cros_settings.h"

21 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"	21 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

22 #include "chrome/browser/chromeos/dbus/power_manager_client.h"	22 #include "chrome/browser/chromeos/dbus/power_manager_client.h"

23 #include "chrome/browser/chromeos/dbus/update_engine_client.h"	23 #include "chrome/browser/chromeos/dbus/update_engine_client.h"

24 #include "chrome/browser/chromeos/login/user_manager.h"	24 #include "chrome/browser/chromeos/login/user_manager.h"

25 #include "chrome/browser/chromeos/login/wizard_controller.h"	25 #include "chrome/browser/chromeos/login/wizard_controller.h"

26 #include "chrome/browser/google/google_util.h"	26 #include "chrome/browser/google/google_util.h"

27 #include "chrome/browser/policy/browser_policy_connector.h"	27 #include "chrome/browser/policy/browser_policy_connector.h"

28 #include "chrome/common/chrome_version_info.h"	28 #include "chrome/common/chrome_version_info.h"

29 #include "chrome/common/url_constants.h"	29 #include "chrome/common/url_constants.h"

	30 #include "content/browser/webui/web_ui.h"

30 #include "content/public/common/content_client.h"	31 #include "content/public/common/content_client.h"

31 #include "googleurl/src/gurl.h"	32 #include "googleurl/src/gurl.h"

32 #include "grit/chromium_strings.h"	33 #include "grit/chromium_strings.h"

33 #include "grit/generated_resources.h"	34 #include "grit/generated_resources.h"

34 #include "grit/locale_settings.h"	35 #include "grit/locale_settings.h"

35 #include "grit/theme_resources.h"	36 #include "grit/theme_resources.h"

36 #include "ui/base/l10n/l10n_util.h"	37 #include "ui/base/l10n/l10n_util.h"

37 #include "ui/base/resource/resource_bundle.h"	38 #include "ui/base/resource/resource_bundle.h"

38 #include "v8/include/v8.h"	39 #include "v8/include/v8.h"

39 #include "webkit/glue/user_agent.h"	40 #include "webkit/glue/user_agent.h"

(...skipping 408 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
448 // If UpdateEngineClient still has the observer, then the page handler	449 // If UpdateEngineClient still has the observer, then the page handler

449 // is valid.	450 // is valid.

450 AboutPageHandler* handler = observer->page_handler();	451 AboutPageHandler* handler = observer->page_handler();

451 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));	452 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));

452 handler->web_ui()->CallJavascriptFunction(	453 handler->web_ui()->CallJavascriptFunction(

453 "AboutPage.updateSelectedOptionCallback", *channel_string);	454 "AboutPage.updateSelectedOptionCallback", *channel_string);

454 }	455 }

455 }	456 }

456	457

457 } // namespace chromeos	458 } // namespace chromeos

OLD	NEW