chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc - Issue 8895023: Options2: Pull the trigger.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc

Issue 8895023: Options2: Pull the trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: DIAF. Created 9 years 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/options2/chromeos/bluetooth_options_handler.h ('k') | chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc

similarity index 98%

copy from chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

copy to chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc

index 5dfe692669f58ca38ff6ec853471d4d6fe884702..f8f6a28f753b097c6898ff665abda8c23c7d879a 100644

--- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

+++ b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.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/webui/options/chromeos/bluetooth_options_handler.h"

+#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"

#include "base/bind.h"

#include "base/command_line.h"

@@ -10,7 +10,7 @@

#include "base/values.h"

#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"

#include "chrome/browser/chromeos/system/runtime_environment.h"

-#include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"

+#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h"

#include "chrome/common/chrome_switches.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -19,7 +19,7 @@

namespace {

-// |UpdateDeviceCallback| takes a variable length list as an arugment. The

+// |UpdateDeviceCallback| takes a variable length list as an argument. The

// value stored in each list element is indicated by the following constants.

const int kUpdateDeviceAddressIndex = 0;

const int kUpdateDeviceCommandIndex = 1;