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

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

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 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/web_intents_settings_handler.h" 5 #include "chrome/browser/ui/webui/options/web_intents_settings_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" 10 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
11 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 11 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
12 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" 12 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
13 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" 13 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
14 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" 14 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
15 #include "chrome/browser/intents/web_intents_registry.h" 15 #include "chrome/browser/intents/web_intents_registry.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ListValue args; 155 ListValue args;
156 args.Append(parent == intents_tree_model_->GetRoot() ? 156 args.Append(parent == intents_tree_model_->GetRoot() ?
157 Value::CreateNullValue() : 157 Value::CreateNullValue() :
158 Value::CreateStringValue(intents_tree_model_->GetTreeNodeId(parent))); 158 Value::CreateStringValue(intents_tree_model_->GetTreeNodeId(parent)));
159 args.Append(children); 159 args.Append(children);
160 160
161 web_ui()->CallJavascriptFunction("IntentsView.loadChildren", args); 161 web_ui()->CallJavascriptFunction("IntentsView.loadChildren", args);
162 } 162 }
163 163
164 } // namespace options 164 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/web_intents_settings_handler.h ('k') | chrome/browser/ui/webui/options2/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698